[Emacs-diffs] Changes to emacs/lib-src/etags.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/lib-src/etags.c
diff -c emacs/lib-src/etags.c:3.35.2.1 emacs/lib-src/etags.c:3.35.2.2
*** emacs/lib-src/etags.c:3.35.2.1      Fri Apr 16 12:49:44 2004
--- emacs/lib-src/etags.c       Mon Jun 28 07:28:22 2004
***************
*** 177,191 ****
  # define CTAGS FALSE
  #endif
  
- /* Exit codes for success and failure.  */
- #ifdef VMS
- # define      GOOD    1
- # define      BAD     0
- #else
- # define      GOOD    0
- # define      BAD     1
- #endif
- 
  #define streq(s,t)    (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t))
  #define strcaseeq(s,t)        (assert((s)!=NULL && (t)!=NULL), 
!etags_strcasecmp (s, t))
  #define strneq(s,t,n) (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
--- 177,182 ----
***************
*** 830,836 ****
    puts ("Copyright (C) 2002 Free Software Foundation, Inc. and Ken Arnold");
    puts ("This program is distributed under the same terms as Emacs");
  
!   exit (GOOD);
  }
  
  static void
--- 821,827 ----
    puts ("Copyright (C) 2002 Free Software Foundation, Inc. and Ken Arnold");
    puts ("This program is distributed under the same terms as Emacs");
  
!   exit (EXIT_SUCCESS);
  }
  
  static void
***************
*** 849,855 ****
        }
  
    if (help_for_lang)
!     exit (GOOD);
  
    printf ("Usage: %s [options] [[regex-option ...] file-name] ...\n\
  \n\
--- 840,846 ----
        }
  
    if (help_for_lang)
!     exit (EXIT_SUCCESS);
  
    printf ("Usage: %s [options] [[regex-option ...] file-name] ...\n\
  \n\
***************
*** 990,996 ****
    puts ("");
    puts ("Report bugs to address@hidden");
  
!   exit (GOOD);
  }
  
  
--- 981,987 ----
    puts ("");
    puts ("Report bugs to address@hidden");
  
!   exit (EXIT_SUCCESS);
  }
  
  
***************
*** 1413,1419 ****
  
        if (fclose (tagf) == EOF)
        pfatal (tagfile);
!       exit (GOOD);
      }
  
    if (update)
--- 1404,1410 ----
  
        if (fclose (tagf) == EOF)
        pfatal (tagfile);
!       exit (EXIT_SUCCESS);
      }
  
    if (update)
***************
*** 1432,1438 ****
          sprintf (cmd,
                   "mv %s OTAGS;fgrep -v '\t%s\t' OTAGS >%s;rm OTAGS",
                   tagfile, argbuffer[i].what, tagfile);
!         if (system (cmd) != GOOD)
            fatal ("failed to execute shell command", (char *)NULL);
        }
        append_to_tagfile = TRUE;
--- 1423,1429 ----
          sprintf (cmd,
                   "mv %s OTAGS;fgrep -v '\t%s\t' OTAGS >%s;rm OTAGS",
                   tagfile, argbuffer[i].what, tagfile);
!         if (system (cmd) != EXIT_SUCCESS)
            fatal ("failed to execute shell command", (char *)NULL);
        }
        append_to_tagfile = TRUE;
***************
*** 1453,1459 ****
        sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
        exit (system (cmd));
      }
!   return GOOD;
  }
  
  
--- 1444,1450 ----
        sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
        exit (system (cmd));
      }
!   return EXIT_SUCCESS;
  }
  
  
***************
*** 6470,6476 ****
       char *s1, *s2;
  {
    error (s1, s2);
!   exit (BAD);
  }
  
  static void
--- 6461,6467 ----
       char *s1, *s2;
  {
    error (s1, s2);
!   exit (EXIT_FAILURE);
  }
  
  static void
***************
*** 6478,6484 ****
       char *s1;
  {
    perror (s1);
!   exit (BAD);
  }
  
  static void
--- 6469,6475 ----
       char *s1;
  {
    perror (s1);
!   exit (EXIT_FAILURE);
  }
  
  static void
***************
*** 6492,6498 ****
  fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
         progname, "-h");
  #endif
!   exit (BAD);
  }
  
  /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
--- 6483,6489 ----
  fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
         progname, "-h");
  #endif
!   exit (EXIT_FAILURE);
  }
  
  /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
***************
*** 6788,6790 ****
--- 6779,6783 ----
  
  /* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
     (do not change this comment) */
+ 
+ /* etags.c ends here */