prettyness police

[unix-history] / usr / src / usr.bin / ctags / ctags.c

diff --git a/usr/src/usr.bin/ctags/ctags.c b/usr/src/usr.bin/ctags/ctags.c
index a61612a..98433cc 100644 (file)
--- a/usr/src/usr.bin/ctags/ctags.c
+++ b/usr/src/usr.bin/ctags/ctags.c
@@ -12,12 +12,16 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ctags.c    8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)ctags.c    8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#include <err.h>
+#include <limits.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

+#include <unistd.h>
+

 #include "ctags.h"
 
 /*
 #include "ctags.h"
 
 /*


@@ -27,86 +31,89 @@ static char sccsid[] = "@(#)ctags.c 8.1 (Berkeley) %G%";
 NODE   *head;                  /* head of the sorted binary tree */
 
                                /* boolean "func" (see init()) */
 NODE   *head;                  /* head of the sorted binary tree */
 
                                /* boolean "func" (see init()) */

-bool   _wht[0177],_etk[0177],_itk[0177],_btk[0177],_gd[0177];
+bool   _wht[256], _etk[256], _itk[256], _btk[256], _gd[256];

 
 

-FILE   *inf,                   /* ioptr for current input file */
-       *outf;                  /* ioptr for tags file */
+FILE   *inf;                   /* ioptr for current input file */
+FILE   *outf;                  /* ioptr for tags file */

 
 long   lineftell;              /* ftell after getc( inf ) == '\n' */
 
 
 long   lineftell;              /* ftell after getc( inf ) == '\n' */
 

-int    lineno,                 /* line number of current line */
-       dflag,                  /* -d: non-macro defines */
-       tflag,                  /* -t: create tags for typedefs */
-       wflag,                  /* -w: suppress warnings */
-       vflag,                  /* -v: vgrind style index output */
-       xflag;                  /* -x: cxref style output */
+int    lineno;                 /* line number of current line */
+int    dflag;                  /* -d: non-macro defines */
+int    tflag;                  /* -t: create tags for typedefs */
+int    vflag;                  /* -v: vgrind style index output */
+int    wflag;                  /* -w: suppress warnings */
+int    xflag;                  /* -x: cxref style output */
+
+char   *curfile;               /* current input file name */
+char   searchar = '/';         /* use /.../ searches by default */
+char   lbuf[LINE_MAX];

 
 

-char   *curfile,               /* current input file name */
-       searchar = '/',         /* use /.../ searches by default */
-       lbuf[BUFSIZ];
+void   init __P((void));
+void   find_entries __P((char *));

 
 

-main(argc,argv)
+int
+main(argc, argv)

        int     argc;
        char    **argv;
 {
        int     argc;
        char    **argv;
 {

-       extern char     *optarg;                /* getopt arguments */
-       extern int      optind;

        static char     *outfile = "tags";      /* output file */
        static char     *outfile = "tags";      /* output file */

-       int     aflag,                          /* -a: append to tags */
-               uflag,                          /* -u: update tags */
-               exit_val,                       /* exit value */
-               step,                           /* step through args */
-               ch;                             /* getopts char */
+       int     aflag;                          /* -a: append to tags */
+       int     uflag;                          /* -u: update tags */
+       int     exit_val;                       /* exit value */
+       int     step;                           /* step through args */
+       int     ch;                             /* getopts char */

        char    cmd[100];                       /* too ugly to explain */
 
        aflag = uflag = NO;
        char    cmd[100];                       /* too ugly to explain */
 
        aflag = uflag = NO;

-       while ((ch = getopt(argc,argv,"BFadf:tuwvx")) != EOF)
-               switch((char)ch) {
-                       case 'B':
-                               searchar = '?';
-                               break;
-                       case 'F':
-                               searchar = '/';
-                               break;
-                       case 'a':
-                               aflag++;
-                               break;
-                       case 'd':
-                               dflag++;
-                               break;
-                       case 'f':
-                               outfile = optarg;
-                               break;
-                       case 't':
-                               tflag++;
-                               break;
-                       case 'u':
-                               uflag++;
-                               break;
-                       case 'w':
-                               wflag++;
-                               break;
-                       case 'v':
-                               vflag++;
-                       case 'x':
-                               xflag++;
-                               break;
-                       case '?':
-                       default:
-                               goto usage;
+       while ((ch = getopt(argc, argv, "BFadf:tuwvx")) != EOF)
+               switch(ch) {
+               case 'B':
+                       searchar = '?';
+                       break;
+               case 'F':
+                       searchar = '/';
+                       break;
+               case 'a':
+                       aflag++;
+                       break;
+               case 'd':
+                       dflag++;
+                       break;
+               case 'f':
+                       outfile = optarg;
+                       break;
+               case 't':
+                       tflag++;
+                       break;
+               case 'u':
+                       uflag++;
+                       break;
+               case 'w':
+                       wflag++;
+                       break;
+               case 'v':
+                       vflag++;
+               case 'x':
+                       xflag++;
+                       break;
+               case '?':
+               default:
+                       goto usage;

                }
        argv += optind;
        argc -= optind;
        if (!argc) {
                }
        argv += optind;
        argc -= optind;
        if (!argc) {

-usage:         puts("Usage: ctags [-BFadtuwvx] [-f tagsfile] file ...");
+usage:         (void)fprintf(stderr,
+                       "usage: ctags [-BFadtuwvx] [-f tagsfile] file ...");

                exit(1);
        }
 
        init();
 
                exit(1);
        }
 
        init();
 

-       for (exit_val = step = 0;step < argc;++step)
-               if (!(inf = fopen(argv[step],"r"))) {
-                       perror(argv[step]);
+       for (exit_val = step = 0; step < argc; ++step)
+               if (!(inf = fopen(argv[step], "r"))) {
+                       warn("%s", argv[step]);

                        exit_val = 1;
                }
                else {
                        exit_val = 1;
                }
                else {


@@ -120,20 +127,22 @@ usage:            puts("Usage: ctags [-BFadtuwvx] [-f tagsfile] file ...");
                        put_entries(head);
                else {
                        if (uflag) {
                        put_entries(head);
                else {
                        if (uflag) {

-                               for (step = 0;step < argc;step++) {
-                                       (void)sprintf(cmd,"mv %s OTAGS;fgrep -v '\t%s\t' OTAGS >%s;rm OTAGS",outfile,argv[step],outfile);
+                               for (step = 0; step < argc; step++) {
+                                       (void)sprintf(cmd,
+                                               "mv %s OTAGS; fgrep -v '\t%s\t' OTAGS >%s; rm OTAGS",
+                                                       outfile, argv[step],
+                                                       outfile);

                                        system(cmd);
                                }
                                ++aflag;
                        }
                                        system(cmd);
                                }
                                ++aflag;
                        }

-                       if (!(outf = fopen(outfile, aflag ? "a" : "w"))) {
-                               perror(outfile);
-                               exit(exit_val);
-                       }
+                       if (!(outf = fopen(outfile, aflag ? "a" : "w")))
+                               err(exit_val, "%s", outfile);

                        put_entries(head);
                        (void)fclose(outf);
                        if (uflag) {
                        put_entries(head);
                        (void)fclose(outf);
                        if (uflag) {

-                               (void)sprintf(cmd,"sort %s -o %s",outfile,outfile);
+                               (void)sprintf(cmd, "sort -o %s %s",
+                                               outfile, outfile);

                                system(cmd);
                        }
                }
                                system(cmd);
                        }
                }


@@ -150,12 +159,13 @@ usage:            puts("Usage: ctags [-BFadtuwvx] [-f tagsfile] file ...");
  *     CWHITE are set to YES.  Thus, "_wht" of a char is YES if it is in
  *     the string CWHITE, else NO.
  */
  *     CWHITE are set to YES.  Thus, "_wht" of a char is YES if it is in
  *     the string CWHITE, else NO.
  */

+void

 init()
 {
 init()
 {

-       register int    i;
-       register char   *sp;
+       int             i;
+       unsigned char   *sp;

 
 

-       for (i = 0; i < 0177; i++) {
+       for (i = 0; i < 256; i++) {

                _wht[i] = _etk[i] = _itk[i] = _btk[i] = NO;
                _gd[i] = YES;
        }
                _wht[i] = _etk[i] = _itk[i] = _btk[i] = NO;
                _gd[i] = YES;
        }


@@ -181,18 +191,19 @@ init()
  *     this routine opens the specified file and calls the function
  *     which searches the file.
  */
  *     this routine opens the specified file and calls the function
  *     which searches the file.
  */

+void

 find_entries(file)
        char    *file;
 {
 find_entries(file)
        char    *file;
 {

-       register char   *cp;
+       char    *cp;

 
        lineno = 0;                             /* should be 1 ?? KB */
 
        lineno = 0;                             /* should be 1 ?? KB */

-       if (cp = rindex(file, '.')) {
+       if (cp = strrchr(file, '.')) {

                if (cp[1] == 'l' && !cp[2]) {
                if (cp[1] == 'l' && !cp[2]) {

-                       register int    c;
+                       int     c;

 
                        for (;;) {
 
                        for (;;) {

-                               if (GETC(==,EOF))
+                               if (GETC(==, EOF))

                                        return;
                                if (!iswhite(c)) {
                                        rewind(inf);
                                        return;
                                if (!iswhite(c)) {
                                        rewind(inf);


@@ -200,7 +211,7 @@ find_entries(file)
                                }
                        }
 #define        LISPCHR ";(["
                                }
                        }
 #define        LISPCHR ";(["

-/* lisp */             if (index(LISPCHR,(char)c)) {
+/* lisp */             if (strchr(LISPCHR, c)) {

                                l_entries();
                                return;
                        }
                                l_entries();
                                return;
                        }


@@ -210,8 +221,8 @@ find_entries(file)
                                 * for C references.  This may be wrong.
                                 */
                                toss_yysec();
                                 * for C references.  This may be wrong.
                                 */
                                toss_yysec();

-                               (void)strcpy(lbuf,"%%$");
-                               pfnote("yylex",lineno);
+                               (void)strcpy(lbuf, "%%$");
+                               pfnote("yylex", lineno);

                                rewind(inf);
                        }
                }
                                rewind(inf);
                        }
                }


@@ -221,8 +232,8 @@ find_entries(file)
                         * for C references.  This may be wrong.
                         */
                        toss_yysec();
                         * for C references.  This may be wrong.
                         */
                        toss_yysec();

-                       (void)strcpy(lbuf,"%%$");
-                       pfnote("yyparse",lineno);
+                       (void)strcpy(lbuf, "%%$");
+                       pfnote("yyparse", lineno);

                        y_entries();
                }
 /* fortran */  else if ((cp[1] != 'c' && cp[1] != 'h') && !cp[2]) {
                        y_entries();
                }
 /* fortran */  else if ((cp[1] != 'c' && cp[1] != 'h') && !cp[2]) {