[bug-inetutils] [PATCH] Removing ORIGINAL_SOURCE

[Debarshi Ray]

Here is a patch to remove the ORIGINAL_SOURCE guarded snippets from libls:

diff -urNp inetutils/libls/bsdport.c inetutils-build/libls/bsdport.c
--- inetutils/libls/bsdport.c   2007-12-10 21:17:19.000000000 +0530
+++ inetutils-build/libls/bsdport.c     2008-05-11 14:22:25.000000000 +0530
@@ -1,5 +1,3 @@
-#ifndef ORIGINAL_SOURCE
-
 # ifdef HAVE_CONFIG_H
 #  include <config.h>
 # endif
@@ -142,5 +140,3 @@ group_from_gid (gid_t gid, int ignored)
       return buf;
     }
 }
-
-#endif /* not ORIGINAL_SOURCE */
diff -urNp inetutils/libls/cmp.c inetutils-build/libls/cmp.c
--- inetutils/libls/cmp.c       2007-12-10 21:17:19.000000000 +0530
+++ inetutils-build/libls/cmp.c 2008-05-11 14:24:45.000000000 +0530
@@ -67,12 +67,6 @@ modcmp (a, b)
     return (1);
   else if (b->fts_statp->st_mtime < a->fts_statp->st_mtime)
     return (-1);
-#ifdef ORIGINAL_SOURCE
-  else if (b->fts_statp->st_mtimensec > a->fts_statp->st_mtimensec)
-    return (1);
-  else if (b->fts_statp->st_mtimensec < a->fts_statp->st_mtimensec)
-    return (-1);
-#endif /* ORIGINAL_SOURCE */
   else
     return (namecmp (a, b));
 }
@@ -85,12 +79,6 @@ revmodcmp (a, b)
     return (-1);
   else if (b->fts_statp->st_mtime < a->fts_statp->st_mtime)
     return (1);
-#ifdef ORIGINAL_SOURCE
-  else if (b->fts_statp->st_mtimensec > a->fts_statp->st_mtimensec)
-    return (-1);
-  else if (b->fts_statp->st_mtimensec < a->fts_statp->st_mtimensec)
-    return (1);
-#endif /* ORIGINAL_SOURCE */
   else
     return (revnamecmp (a, b));
 }
@@ -103,12 +91,6 @@ acccmp (a, b)
     return (1);
   else if (b->fts_statp->st_atime < a->fts_statp->st_atime)
     return (-1);
-#ifdef ORIGINAL_SOURCE
-  else if (b->fts_statp->st_atimensec > a->fts_statp->st_atimensec)
-    return (1);
-  else if (b->fts_statp->st_atimensec < a->fts_statp->st_atimensec)
-    return (-1);
-#endif /* ORIGINAL_SOURCE */
   else
     return (namecmp (a, b));
 }
@@ -121,12 +103,6 @@ revacccmp (a, b)
     return (-1);
   else if (b->fts_statp->st_atime < a->fts_statp->st_atime)
     return (1);
-#ifdef ORIGINAL_SOURCE
-  else if (b->fts_statp->st_atimensec > a->fts_statp->st_atimensec)
-    return (-1);
-  else if (b->fts_statp->st_atimensec < a->fts_statp->st_atimensec)
-    return (1);
-#endif /* ORIGINAL_SOURCE */
   else
     return (revnamecmp (a, b));
 }
@@ -139,12 +115,6 @@ statcmp (a, b)
     return (1);
   else if (b->fts_statp->st_ctime < a->fts_statp->st_ctime)
     return (-1);
-#ifdef ORIGINAL_SOURCE
-  else if (b->fts_statp->st_ctimensec > a->fts_statp->st_ctimensec)
-    return (1);
-  else if (b->fts_statp->st_ctimensec < a->fts_statp->st_ctimensec)
-    return (-1);
-#endif /* ORIGINAL_SOURCE */
   else
     return (namecmp (a, b));
 }
@@ -157,12 +127,6 @@ revstatcmp (a, b)
     return (-1);
   else if (b->fts_statp->st_ctime < a->fts_statp->st_ctime)
     return (1);
-#ifdef ORIGINAL_SOURCE
-  else if (b->fts_statp->st_ctimensec > a->fts_statp->st_ctimensec)
-    return (-1);
-  else if (b->fts_statp->st_ctimensec < a->fts_statp->st_ctimensec)
-    return (1);
-#endif /* ORIGINAL_SOURCE */
   else
     return (revnamecmp (a, b));
 }
diff -urNp inetutils/libls/ls.c inetutils-build/libls/ls.c
--- inetutils/libls/ls.c        2007-12-10 21:17:19.000000000 +0530
+++ inetutils-build/libls/ls.c  2008-05-11 14:25:55.000000000 +0530
@@ -264,12 +264,7 @@ ls_main (argc, argv)
   /* If -l or -s, figure out block size. */
   if (f_longform || f_size)
     {
-#ifdef ORIGINAL_SOURCE
-      if (!kflag)
-       getbsize (&notused, &blocksize);
-#else
       blocksize = 1024;                /* Fuck this hair-splitting */
-#endif /* ORIGINAL_SOURCE */
       blocksize /= 512;
     }

@@ -515,11 +510,7 @@ display (p, list)
                maxgroup = glen;
              if (f_flags)
                {
-#if ORIGINAL_SOURCE
-                 flags = flags_to_string (sp->st_flags, "-");
-#else
                  flags = "-";
-#endif /* ORIGINAL_SOURCE */
                  if ((flen = strlen (flags)) > maxflags)
                    maxflags = flen;
                }
diff -urNp inetutils/libls/print.c inetutils-build/libls/print.c
--- inetutils/libls/print.c     2007-12-10 21:17:19.000000000 +0530
+++ inetutils-build/libls/print.c       2008-05-11 14:23:34.000000000 +0530
@@ -111,18 +111,11 @@ printlong (dp)
       if (IS_NOPRINT (p))
        continue;
       sp = p->fts_statp;
-#ifdef ORIGINAL_SOURCE
-      if (f_inode)
-       printf ("%*u ", dp->s_inode, sp->st_ino);
-      if (f_size)
-       printf ("%*qd ", dp->s_block, howmany (sp->st_blocks, blocksize));
-#else
       if (f_inode)
        printf ("%*lu ", dp->s_inode, (unsigned long) sp->st_ino);
       if (f_size)
        printf ("%*llu ",
                dp->s_block, (long long) howmany (sp->st_blocks, blocksize));
-#endif /* ORIGINAL_SOURCE */
       strmode (sp->st_mode, buf);
       np = p->fts_pointer;
       printf ("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
@@ -250,20 +243,12 @@ printaname (p, inodefield, sizefield)

   sp = p->fts_statp;
   chcnt = 0;
-#ifdef ORIGINAL_SOURCE
-  if (f_inode)
-    chcnt += printf ("%*u ", (int) inodefield, sp->st_ino);
-  if (f_size)
-    chcnt += printf ("%*qd ",
-                    (int) sizefield, howmany (sp->st_blocks, blocksize));
-#else
   if (f_inode)
     chcnt += printf ("%*lu ", (int) inodefield, (unsigned long) sp->st_ino);
   if (f_size)
     chcnt += printf ("%*llu ",
                     (int) sizefield, (long long) howmany (sp->st_blocks,
                                                           blocksize));
-#endif /* ORIGINAL_SOURCE */
   chcnt += putname (p->fts_name);
   if (f_type || (f_typedir && S_ISDIR (sp->st_mode)))
     chcnt += printtype (sp->st_mode);
@@ -381,11 +366,6 @@ printtype (mode)
     case S_IFSOCK:
       putchar ('=');
       return (1);
-#ifdef ORIGINAL_SOURCE
-    case S_IFWHT:
-      putchar ('%');
-      return (1);
-#endif /* ORIGINAL_SOURCE */
     }
   if (mode & (S_IXUSR | S_IXGRP | S_IXOTH))
     {
diff -urNp inetutils/libls/stat_flags.c inetutils-build/libls/stat_flags.c
--- inetutils/libls/stat_flags.c        2007-12-10 21:17:19.000000000 +0530
+++ inetutils-build/libls/stat_flags.c  2008-05-13 07:51:43.000000000 +0530
@@ -62,22 +62,6 @@ flags_to_string (flags, def)

   string[0] = '\0';
   prefix = NULL;
-#ifdef ORIGINAL_SOURCE
-  if (flags & UF_APPEND)
-    SAPPEND ("uappnd");
-  if (flags & UF_IMMUTABLE)
-    SAPPEND ("uchg");
-  if (flags & UF_NODUMP)
-    SAPPEND ("nodump");
-  if (flags & UF_OPAQUE)
-    SAPPEND ("opaque");
-  if (flags & SF_APPEND)
-    SAPPEND ("sappnd");
-  if (flags & SF_ARCHIVED)
-    SAPPEND ("arch");
-  if (flags & SF_IMMUTABLE)
-    SAPPEND ("schg");
-#endif /* ORIGINAL_SOURCE */
   return (prefix == NULL && def != NULL ? def : string);
 }

@@ -103,56 +87,9 @@ string_to_flags (stringp, setp, clrp)
      char **stringp;
      u_int *setp, *clrp;
 {
-  int clear;
-  char *string, *p;
-
   if (setp)
     *setp = 0;
   if (clrp)
     *clrp = 0;
-  string = *stringp;
-#ifdef ORIGINAL_SOURCE
-  while ((p = strsep (&string, "\t ,")) != NULL)
-    {
-      clear = 0;
-      *stringp = p;
-      if (*p == '\0')
-       continue;
-      if (p[0] == 'n' && p[1] == 'o')
-       {
-         clear = 1;
-         p += 2;
-       }
-      switch (p[0])
-       {
-       case 'a':
-         TEST (p, "arch", SF_ARCHIVED);
-         TEST (p, "archived", SF_ARCHIVED);
-         return (1);
-       case 'd':
-         clear = !clear;
-         TEST (p, "dump", UF_NODUMP);
-         return (1);
-       case 'o':
-         TEST (p, "opaque", UF_OPAQUE);
-         return (1);
-       case 's':
-         TEST (p, "sappnd", SF_APPEND);
-         TEST (p, "sappend", SF_APPEND);
-         TEST (p, "schg", SF_IMMUTABLE);
-         TEST (p, "schange", SF_IMMUTABLE);
-         TEST (p, "simmutable", SF_IMMUTABLE);
-         return (1);
-       case 'u':
-         TEST (p, "uappnd", UF_APPEND);
-         TEST (p, "uappend", UF_APPEND);
-         TEST (p, "uchg", UF_IMMUTABLE);
-         TEST (p, "uchange", UF_IMMUTABLE);
-         TEST (p, "uimmutable", UF_IMMUTABLE);
-       default:
-         return (1);
-       }
-    }
-#endif /* ORIGINAL_SOURCE */
   return (0);
 }
diff -urNp inetutils/ChangeLog inetutils-build/ChangeLog
--- inetutils/ChangeLog 2008-05-06 07:17:58.000000000 +0530
+++ inetutils-build/ChangeLog   2008-05-13 07:58:23.000000000 +0530
@@ -1,3 +1,8 @@
+2008-05-13  Debarshi Ray <address@hidden>
+
+       * libls/bsdport, libls/cmp.c, libls/ls.c, libls/print.c,
+       libls/stat_flags [ORIGINAL_SOURCE]: Removed dead code.
+
 2008-04-21  Guillem Jover <address@hidden>

        * syslogd/syslogd.c (init): Add ARG_UNUSED attribute to SIGNO

After doing this, is the function string_to_flags from
libls/stat_flags.c still necessary? It is also not being called from
anywhere.

Happy hacking,
Debarshi
-- 
"From what we get, we can make a living; what we give, however, makes a life."
 -- Arthur Ashe