Fix gcc "bodyless for/while" warnings.

SCCS-vsn: bin/csh/csh.c 5.31
SCCS-vsn: bin/csh/dir.c 5.16
SCCS-vsn: bin/csh/dol.c 5.16
SCCS-vsn: bin/csh/file.c 5.20
SCCS-vsn: bin/csh/func.c 5.30
SCCS-vsn: bin/csh/glob.c 5.30
SCCS-vsn: bin/csh/lex.c 5.24
SCCS-vsn: bin/csh/misc.c 5.16
SCCS-vsn: bin/csh/proc.c 5.27
SCCS-vsn: bin/csh/set.c 5.16
SCCS-vsn: bin/csh/str.c 5.9

diff --git a/usr/src/bin/csh/csh.c b/usr/src/bin/csh/csh.c
index de1506d..991eb90 100644 (file)
--- a/usr/src/bin/csh/csh.c
+++ b/usr/src/bin/csh/csh.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)csh.c      5.30 (Berkeley) %G%";
+static char sccsid[] = "@(#)csh.c      5.31 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -133,7 +133,8 @@ main(argc, argv)
        tempv[1][0] = '\0';
        tempv[1][1] = '\0';
        tempv[1] = NULL;
        tempv[1][0] = '\0';
        tempv[1][1] = '\0';
        tempv[1] = NULL;

-       for (tcp = *tempv; *tcp++;);
+       for (tcp = *tempv; *tcp++;)
+           continue;

        for (tcp--; tcp >= *tempv; tcp--)
            tcp[1] = tcp[0];
        *++tcp = '-';
        for (tcp--; tcp >= *tempv; tcp--)
            tcp[1] = tcp[0];
        *++tcp = '-';


@@ -148,7 +149,8 @@ main(argc, argv)
     {
        int     k;
 
     {
        int     k;
 

-       for (k = 0200; k <= 0377 && !Isprint(k); k++);
+       for (k = 0200; k <= 0377 && !Isprint(k); k++)
+           continue;

        AsciiOnly = k > 0377;
     }
 #else
        AsciiOnly = k > 0377;
     }
 #else


@@ -236,12 +238,12 @@ main(argc, argv)
 
     /*
      * Process the arguments.
 
     /*
      * Process the arguments.

-     * 
+     *

      * Note that processing of -v/-x is actually delayed till after script
      * processing.
      * Note that processing of -v/-x is actually delayed till after script
      * processing.

-     * 
+     *

      * We set the first character of our name to be '-' if we are a shell
      * We set the first character of our name to be '-' if we are a shell

-     * running interruptible commands.  Many programs which examine ps'es 
+     * running interruptible commands.  Many programs which examine ps'es

      * use this to filter such shells out.
      */
     argc--, tempv++;
      * use this to filter such shells out.
      */
     argc--, tempv++;


@@ -338,12 +340,12 @@ main(argc, argv)
            stderror(ERR_SYSTEM, tempv[0], strerror(errno));
        }
        ffile = SAVE(tempv[0]);
            stderror(ERR_SYSTEM, tempv[0], strerror(errno));
        }
        ffile = SAVE(tempv[0]);

-       /* 
+       /*

         * Replace FSHIN. Handle /dev/std{in,out,err} specially
         * since once they are closed we cannot open them again.
         * In that case we use our own saved descriptors
         */
         * Replace FSHIN. Handle /dev/std{in,out,err} specially
         * since once they are closed we cannot open them again.
         * In that case we use our own saved descriptors
         */

-       if ((SHIN = dmove(nofile, FSHIN)) < 0) 
+       if ((SHIN = dmove(nofile, FSHIN)) < 0)

            switch(nofile) {
            case 0:
                SHIN = FSHIN;
            switch(nofile) {
            case 0:
                SHIN = FSHIN;


@@ -437,7 +439,7 @@ main(argc, argv)
                shpgrp = getpid();
                tpgrp = shpgrp;
                /*
                shpgrp = getpid();
                tpgrp = shpgrp;
                /*

-                * Setpgid will fail if we are a session leader and 
+                * Setpgid will fail if we are a session leader and

                 * mypid == mypgrp (POSIX 4.3.3)
                 */
                if (opgrp != shpgrp)
                 * mypid == mypgrp (POSIX 4.3.3)
                 */
                if (opgrp != shpgrp)


@@ -454,7 +456,7 @@ main(argc, argv)
            }
            if (tpgrp == -1) {
 notty:
            }
            if (tpgrp == -1) {
 notty:

-               (void) fprintf(csherr, "Warning: no access to tty (%s).\n", 
+               (void) fprintf(csherr, "Warning: no access to tty (%s).\n",

                               strerror(errno));
                (void) fprintf(csherr, "Thus no job control in this shell.\n");
            }
                               strerror(errno));
                (void) fprintf(csherr, "Thus no job control in this shell.\n");
            }


@@ -658,7 +660,7 @@ srcunit(unit, onlyown, hflg)
      * stream since we have stuff in different structures. If we weren't
      * careful an interrupt could corrupt SHIN's Bin structure and kill the
      * shell.
      * stream since we have stuff in different structures. If we weren't
      * careful an interrupt could corrupt SHIN's Bin structure and kill the
      * shell.

-     * 
+     *

      * We could avoid the critical region by grouping all the stuff in a single
      * structure and pointing at it to move it all at once.  This is less
      * efficient globally on many variable references however.
      * We could avoid the critical region by grouping all the stuff in a single
      * structure and pointing at it to move it all at once.  This is less
      * efficient globally on many variable references however.


@@ -964,7 +966,7 @@ process(catch)
        /*
         * Save input text on the history list if reading in old history, or it
         * is from the terminal at the top level and not in a loop.
        /*
         * Save input text on the history list if reading in old history, or it
         * is from the terminal at the top level and not in a loop.

-        * 
+        *

         * PWP: entry of items in the history list while in a while loop is done
         * elsewhere...
         */
         * PWP: entry of items in the history list while in a while loop is done
         * elsewhere...
         */


@@ -993,7 +995,7 @@ process(catch)
        if (seterr)
            stderror(ERR_OLD);
 
        if (seterr)
            stderror(ERR_OLD);
 

-       execute(savet, (tpgrp > 0 ? tpgrp : -1), NULL, NULL); 
+       execute(savet, (tpgrp > 0 ? tpgrp : -1), NULL, NULL);

 
        /*
         * Made it!
 
        /*
         * Made it!


@@ -1071,7 +1073,7 @@ mailchk()
        if (cnt == 1)
            (void) fprintf(cshout, "You have %smail.\n", new ? "new " : "");
        else
        if (cnt == 1)
            (void) fprintf(cshout, "You have %smail.\n", new ? "new " : "");
        else

-           (void) fprintf(cshout, "%s in %s.\n", new ? "New mail" : "Mail", 
+           (void) fprintf(cshout, "%s in %s.\n", new ? "New mail" : "Mail",

                           short2str(*vp));
     }
     chktim = t;
                           short2str(*vp));
     }
     chktim = t;


@@ -1228,4 +1230,3 @@ printprompt()
        (void) fprintf(cshout, "? ");
     (void) fflush(cshout);
 }
        (void) fprintf(cshout, "? ");
     (void) fflush(cshout);
 }

-

diff --git a/usr/src/bin/csh/dir.c b/usr/src/bin/csh/dir.c
index f4d0d38..3376c30 100644 (file)
--- a/usr/src/bin/csh/dir.c
+++ b/usr/src/bin/csh/dir.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dir.c      5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)dir.c      5.16 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -27,13 +27,13 @@ static char sccsid[] = "@(#)dir.c   5.15 (Berkeley) %G%";
 
 /* Directory management. */
 
 
 /* Directory management. */
 

-static struct directory        
+static struct directory

                *dfind __P((Char *));
                *dfind __P((Char *));

-static Char    *dfollow __P((Char *));
-static void     printdirs __P((void));
-static Char    *dgoto __P((Char *));
-static void     dnewcwd __P((struct directory *));
-static void     dset __P((Char *));
+static Char    *dfollow __P((Char *));
+static void     printdirs __P((void));
+static Char    *dgoto __P((Char *));
+static void     dnewcwd __P((struct directory *));
+static void     dset __P((Char *));

 
 struct directory dhead;                /* "head" of loop */
 int     printd;                        /* force name to be printed */
 
 struct directory dhead;                /* "head" of loop */
 int     printd;                        /* force name to be printed */


@@ -115,7 +115,7 @@ Char *dp;
 {
     /*
      * Don't call set() directly cause if the directory contains ` or
 {
     /*
      * Don't call set() directly cause if the directory contains ` or

-     * other junk characters glob will fail. 
+     * other junk characters glob will fail.

      */
     register Char **vec = (Char **) xmalloc((size_t) (2 * sizeof(Char **)));
 
      */
     register Char **vec = (Char **) xmalloc((size_t) (2 * sizeof(Char **)));
 


@@ -363,17 +363,21 @@ dgoto(cp)
        register Char *p, *q;
        int     cwdlen;
 
        register Char *p, *q;
        int     cwdlen;
 

-       for (p = dcwd->di_name; *p++;);
+       for (p = dcwd->di_name; *p++;)
+           continue;

        if ((cwdlen = p - dcwd->di_name - 1) == 1)      /* root */
            cwdlen = 0;
        if ((cwdlen = p - dcwd->di_name - 1) == 1)      /* root */
            cwdlen = 0;

-       for (p = cp; *p++;);
+       for (p = cp; *p++;)
+           continue;

        dp = (Char *) xmalloc((size_t)((cwdlen + (p - cp) + 1) * sizeof(Char)));
        dp = (Char *) xmalloc((size_t)((cwdlen + (p - cp) + 1) * sizeof(Char)));

-       for (p = dp, q = dcwd->di_name; *p++ = *q++;);
+       for (p = dp, q = dcwd->di_name; *p++ = *q++;)
+           continue;

        if (cwdlen)
            p[-1] = '/';
        else
            p--;                /* don't add a / after root */
        if (cwdlen)
            p[-1] = '/';
        else
            p--;                /* don't add a / after root */

-       for (q = cp; *p++ = *q++;);
+       for (q = cp; *p++ = *q++;)
+           continue;

        xfree((ptr_t) cp);
        cp = dp;
        dp += cwdlen;
        xfree((ptr_t) cp);
        cp = dp;
        dp += cwdlen;


@@ -420,9 +424,11 @@ dfollow(cp)
        Char    buf[MAXPATHLEN];
 
        for (cdp = c->vec; *cdp; cdp++) {
        Char    buf[MAXPATHLEN];
 
        for (cdp = c->vec; *cdp; cdp++) {

-           for (dp = buf, p = *cdp; *dp++ = *p++;);
+           for (dp = buf, p = *cdp; *dp++ = *p++;)
+               continue;

            dp[-1] = '/';
            dp[-1] = '/';

-           for (p = cp; *dp++ = *p++;);
+           for (p = cp; *dp++ = *p++;)
+               continue;

            if (chdir(short2str(buf)) >= 0) {
                printd = 1;
                xfree((ptr_t) cp);
            if (chdir(short2str(buf)) >= 0) {
                printd = 1;
                xfree((ptr_t) cp);


@@ -631,9 +637,10 @@ dcanon(cp, p)
     while (*p) {               /* for each component */
        sp = p;                 /* save slash address */
        while (*++p == '/')     /* flush extra slashes */
     while (*p) {               /* for each component */
        sp = p;                 /* save slash address */
        while (*++p == '/')     /* flush extra slashes */

-           ;
+           continue;

        if (p != ++sp)
        if (p != ++sp)

-           for (p1 = sp, p2 = p; *p1++ = *p2++;);
+           for (p1 = sp, p2 = p; *p1++ = *p2++;)
+               continue;

        p = sp;                 /* save start of component */
        slash = 0;
        while (*++p)            /* find next slash or end of path */
        p = sp;                 /* save start of component */
        slash = 0;
        while (*++p)            /* find next slash or end of path */


@@ -650,7 +657,8 @@ dcanon(cp, p)
                *sp = '\0';
        else if (sp[0] == '.' && sp[1] == 0) {
            if (slash) {
                *sp = '\0';
        else if (sp[0] == '.' && sp[1] == 0) {
            if (slash) {

-               for (p1 = sp, p2 = p + 1; *p1++ = *p2++;);
+               for (p1 = sp, p2 = p + 1; *p1++ = *p2++;)
+                   continue;

                p = --sp;
            }
            else if (--sp != cp)
                p = --sp;
            }
            else if (--sp != cp)


@@ -679,13 +687,15 @@ dcanon(cp, p)
                /*
                 * find length of p
                 */
                /*
                 * find length of p
                 */

-               for (p1 = p; *p1++;);
+               for (p1 = p; *p1++;)
+                   continue;

                if (*link != '/') {
                    /*
                     * Relative path, expand it between the "yyy/" and the
                     * "/..". First, back sp up to the character past "yyy/".
                     */
                if (*link != '/') {
                    /*
                     * Relative path, expand it between the "yyy/" and the
                     * "/..". First, back sp up to the character past "yyy/".
                     */

-                   while (*--sp != '/');
+                   while (*--sp != '/')
+                       continue;

                    sp++;
                    *sp = 0;
                    /*
                    sp++;
                    *sp = 0;
                    /*


@@ -697,9 +707,12 @@ dcanon(cp, p)
                    /*
                     * Copy new path into newcp
                     */
                    /*
                     * Copy new path into newcp
                     */

-                   for (p2 = cp; *p1++ = *p2++;);
-                   for (p1--, p2 = link; *p1++ = *p2++;);
-                   for (p1--, p2 = p; *p1++ = *p2++;);
+                   for (p2 = cp; *p1++ = *p2++;)
+                       continue;
+                   for (p1--, p2 = link; *p1++ = *p2++;)
+                       continue;
+                   for (p1--, p2 = p; *p1++ = *p2++;)
+                       continue;

                    /*
                     * Restart canonicalization at expanded "/xxx".
                     */
                    /*
                     * Restart canonicalization at expanded "/xxx".
                     */


@@ -714,8 +727,10 @@ dcanon(cp, p)
                    /*
                     * Copy new path into newcp
                     */
                    /*
                     * Copy new path into newcp
                     */

-                   for (p2 = link; *p1++ = *p2++;);
-                   for (p1--, p2 = p; *p1++ = *p2++;);
+                   for (p2 = link; *p1++ = *p2++;)
+                       continue;
+                   for (p1--, p2 = p; *p1++ = *p2++;)
+                       continue;

                    /*
                     * Restart canonicalization at beginning
                     */
                    /*
                     * Restart canonicalization at beginning
                     */


@@ -727,9 +742,11 @@ dcanon(cp, p)
            }
            *sp = '/';
            if (sp != cp)
            }
            *sp = '/';
            if (sp != cp)

-               while (*--sp != '/');
+               while (*--sp != '/')
+                   continue;

            if (slash) {
            if (slash) {

-               for (p1 = sp + 1, p2 = p + 1; *p1++ = *p2++;);
+               for (p1 = sp + 1, p2 = p + 1; *p1++ = *p2++;)
+                   continue;

                p = sp;
            }
            else if (cp == sp)
                p = sp;
            }
            else if (cp == sp)


@@ -760,14 +777,16 @@ dcanon(cp, p)
                /*
                 * find length of p
                 */
                /*
                 * find length of p
                 */

-               for (p1 = p; *p1++;);
+               for (p1 = p; *p1++;)
+                   continue;

                if (*link != '/') {
                    /*
                     * Relative path, expand it between the "yyy/" and the
                     * remainder. First, back sp up to the character past
                     * "yyy/".
                     */
                if (*link != '/') {
                    /*
                     * Relative path, expand it between the "yyy/" and the
                     * remainder. First, back sp up to the character past
                     * "yyy/".
                     */

-                   while (*--sp != '/');
+                   while (*--sp != '/')
+                       continue;

                    sp++;
                    *sp = 0;
                    /*
                    sp++;
                    *sp = 0;
                    /*


@@ -779,9 +798,12 @@ dcanon(cp, p)
                    /*
                     * Copy new path into newcp
                     */
                    /*
                     * Copy new path into newcp
                     */

-                   for (p2 = cp; *p1++ = *p2++;);
-                   for (p1--, p2 = link; *p1++ = *p2++;);
-                   for (p1--, p2 = p; *p1++ = *p2++;);
+                   for (p2 = cp; *p1++ = *p2++;)
+                       continue;
+                   for (p1--, p2 = link; *p1++ = *p2++;)
+                       continue;
+                   for (p1--, p2 = p; *p1++ = *p2++;)
+                       continue;

                    /*
                     * Restart canonicalization at expanded "/xxx".
                     */
                    /*
                     * Restart canonicalization at expanded "/xxx".
                     */


@@ -796,8 +818,10 @@ dcanon(cp, p)
                    /*
                     * Copy new path into newcp
                     */
                    /*
                     * Copy new path into newcp
                     */

-                   for (p2 = link; *p1++ = *p2++;);
-                   for (p1--, p2 = p; *p1++ = *p2++;);
+                   for (p2 = link; *p1++ = *p2++;)
+                       continue;
+                   for (p1--, p2 = p; *p1++ = *p2++;)
+                       continue;

                    /*
                     * Restart canonicalization at beginning
                     */
                    /*
                     * Restart canonicalization at beginning
                     */

diff --git a/usr/src/bin/csh/dol.c b/usr/src/bin/csh/dol.c
index 3094002..a361f8b 100644 (file)
--- a/usr/src/bin/csh/dol.c
+++ b/usr/src/bin/csh/dol.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dol.c      5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)dol.c      5.16 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -58,7 +58,7 @@ static int dolnmod;           /* Number of modifiers */
 static int dolmcnt;            /* :gx -> 10000, else 1 */
 
 static void     Dfix2 __P((Char **));
 static int dolmcnt;            /* :gx -> 10000, else 1 */
 
 static void     Dfix2 __P((Char **));

-static Char    *Dpack __P((Char *, Char *));
+static Char    *Dpack __P((Char *, Char *));

 static int      Dword __P((void));
 static void     dolerror __P((Char *));
 static int      DgetC __P((int));
 static int      Dword __P((void));
 static void     dolerror __P((Char *));
 static int      DgetC __P((int));


@@ -513,7 +513,8 @@ Dgetdol()
        if (Isdigit(*np)) {
            int     i;
 
        if (Isdigit(*np)) {
            int     i;
 

-           for (i = 0; Isdigit(*np); i = i * 10 + *np++ - '0');
+           for (i = 0; Isdigit(*np); i = i * 10 + *np++ - '0')
+               continue;

            if ((i < 0 || i > upb) && !any("-*", *np)) {
                dolerror(vp->v_name);
                return;
            if ((i < 0 || i > upb) && !any("-*", *np)) {
                dolerror(vp->v_name);
                return;

diff --git a/usr/src/bin/csh/file.c b/usr/src/bin/csh/file.c
index 1c408d7..737698f 100644 (file)
--- a/usr/src/bin/csh/file.c
+++ b/usr/src/bin/csh/file.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)file.c     5.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)file.c     5.20 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifdef FILEC
 #endif /* not lint */
 
 #ifdef FILEC


@@ -60,10 +60,10 @@ static void  catn __P((Char *, Char *, int));
 static void     copyn __P((Char *, Char *, int));
 static Char     filetype __P((Char *, Char *));
 static void     print_by_column __P((Char *, Char *[], int));
 static void     copyn __P((Char *, Char *, int));
 static Char     filetype __P((Char *, Char *));
 static void     print_by_column __P((Char *, Char *[], int));

-static Char    *tilde __P((Char *, Char *));
+static Char    *tilde __P((Char *, Char *));

 static void     retype __P((void));
 static void     beep __P((void));
 static void     retype __P((void));
 static void     beep __P((void));

-static void     print_recognized_stuff __P((Char *));
+static void     print_recognized_stuff __P((Char *));

 static void     extract_dir_and_name __P((Char *, Char *, Char *));
 static Char    *getentry __P((DIR *, int));
 static void     free_items __P((Char **));
 static void     extract_dir_and_name __P((Char *, Char *, Char *));
 static Char    *getentry __P((DIR *, int));
 static void     free_items __P((Char **));


@@ -269,7 +269,8 @@ tilde(new, old)
     if (old[0] != '~')
        return (Strcpy(new, old));
 
     if (old[0] != '~')
        return (Strcpy(new, old));
 

-    for (p = person, o = &old[1]; *o && *o != '/'; *p++ = *o++);
+    for (p = person, o = &old[1]; *o && *o != '/'; *p++ = *o++)
+       continue;

     *p = '\0';
     if (person[0] == '\0')
        (void) Strcpy(new, value(STRhome));
     *p = '\0';
     if (person[0] == '\0')
        (void) Strcpy(new, value(STRhome));


@@ -490,7 +491,7 @@ again:                              /* search for matches */
        return (numitems);
     }
     else {                     /* LIST */
        return (numitems);
     }
     else {                     /* LIST */

-       qsort((ptr_t) items, numitems, sizeof(items[0]), 
+       qsort((ptr_t) items, numitems, sizeof(items[0]),

              (int (*)(const void *, const void *)) sortscmp);
        print_by_column(looking_for_lognames ? NULL : tilded_dir,
                        items, numitems);
              (int (*)(const void *, const void *)) sortscmp);
        print_by_column(looking_for_lognames ? NULL : tilded_dir,
                        items, numitems);


@@ -520,7 +521,8 @@ recognize(extended_name, entry, name_length, numitems)
        register int len = 0;
 
        x = extended_name;
        register int len = 0;
 
        x = extended_name;

-       for (ent = entry; *x && *x == *ent++; x++, len++);
+       for (ent = entry; *x && *x == *ent++; x++, len++)
+           continue;

        *x = '\0';              /* Shorten at 1st Char diff */
        if (len == name_length) /* Ambiguous to prefix? */
            return (-1);        /* So stop now and save time */
        *x = '\0';              /* Shorten at 1st Char diff */
        if (len == name_length) /* Ambiguous to prefix? */
            return (-1);        /* So stop now and save time */


@@ -554,8 +556,10 @@ is_suffix(check, template)
 {
     register Char *c, *t;
 
 {
     register Char *c, *t;
 

-    for (c = check; *c++;);
-    for (t = template; *t++;);
+    for (c = check; *c++;)
+       continue;
+    for (t = template; *t++;)
+       continue;

     for (;;) {
        if (t == template)
            return 1;
     for (;;) {
        if (t == template)
            return 1;

diff --git a/usr/src/bin/csh/func.c b/usr/src/bin/csh/func.c
index f94633d..31049b1 100644 (file)
--- a/usr/src/bin/csh/func.c
+++ b/usr/src/bin/csh/func.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)func.c     5.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)func.c     5.30 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -821,7 +821,7 @@ wfree()
     struct whyle *nwp;
     btell(&o);
 
     struct whyle *nwp;
     btell(&o);
 

-    if (o.type != F_SEEK) 
+    if (o.type != F_SEEK)

        return;
 
     for (; whyles; whyles = nwp) {
        return;
 
     for (; whyles; whyles = nwp) {


@@ -832,7 +832,7 @@ wfree()
        if (wp->w_end.type != I_SEEK) {
            if (wp->w_end.type != F_SEEK)
                break;
        if (wp->w_end.type != I_SEEK) {
            if (wp->w_end.type != F_SEEK)
                break;

-           if (o.f_seek >= wp->w_start.f_seek && 
+           if (o.f_seek >= wp->w_start.f_seek &&

                (wp->w_end.f_seek == 0 || o.f_seek < wp->w_end.f_seek))
                break;
        }
                (wp->w_end.f_seek == 0 || o.f_seek < wp->w_end.f_seek))
                break;
        }


@@ -937,7 +937,8 @@ dosetenv(v, t)
        int     k;
 
        (void) setlocale(LC_ALL, "");
        int     k;
 
        (void) setlocale(LC_ALL, "");

-       for (k = 0200; k <= 0377 && !Isprint(k); k++);
+       for (k = 0200; k <= 0377 && !Isprint(k); k++)
+               continue;

        AsciiOnly = k > 0377;
 #else
        AsciiOnly = 0;
        AsciiOnly = k > 0377;
 #else
        AsciiOnly = 0;


@@ -962,7 +963,8 @@ dounsetenv(v, t)
      * Find the longest environment variable
      */
     for (maxi = 0, ep = STR_environ; *ep; ep++) {
      * Find the longest environment variable
      */
     for (maxi = 0, ep = STR_environ; *ep; ep++) {

-       for (i = 0, p = *ep; *p && *p != '='; p++, i++);
+       for (i = 0, p = *ep; *p && *p != '='; p++, i++)
+           continue;

        if (i > maxi)
            maxi = i;
     }
        if (i > maxi)
            maxi = i;
     }


@@ -972,7 +974,8 @@ dounsetenv(v, t)
     while (++v && *v)
        for (maxi = 1; maxi;)
            for (maxi = 0, ep = STR_environ; *ep; ep++) {
     while (++v && *v)
        for (maxi = 1; maxi;)
            for (maxi = 0, ep = STR_environ; *ep; ep++) {

-               for (n = name, p = *ep; *p && *p != '='; *n++ = *p++);
+               for (n = name, p = *ep; *p && *p != '='; *n++ = *p++)
+                   continue;

                *n = '\0';
                if (!Gmatch(name, *v))
                    continue;
                *n = '\0';
                if (!Gmatch(name, *v))
                    continue;


@@ -982,7 +985,8 @@ dounsetenv(v, t)
                    int     k;
 
                    (void) setlocale(LC_ALL, "");
                    int     k;
 
                    (void) setlocale(LC_ALL, "");

-                   for (k = 0200; k <= 0377 && !Isprint(k); k++);
+                   for (k = 0200; k <= 0377 && !Isprint(k); k++)
+                       continue;

                    AsciiOnly = k > 0377;
 #else
                    AsciiOnly = getenv("LANG") == NULL &&
                    AsciiOnly = k > 0377;
 #else
                    AsciiOnly = getenv("LANG") == NULL &&


@@ -1087,16 +1091,16 @@ static struct limits {
     int     limdiv;
     char   *limscale;
 }       limits[] = {
     int     limdiv;
     char   *limscale;
 }       limits[] = {

-    RLIMIT_CPU,        "cputime",      1,      "seconds",
+    RLIMIT_CPU,                "cputime",      1,      "seconds",

     RLIMIT_FSIZE,      "filesize",     1024,   "kbytes",
     RLIMIT_DATA,       "datasize",     1024,   "kbytes",
     RLIMIT_STACK,      "stacksize",    1024,   "kbytes",
     RLIMIT_CORE,       "coredumpsize", 1024,   "kbytes",
     RLIMIT_FSIZE,      "filesize",     1024,   "kbytes",
     RLIMIT_DATA,       "datasize",     1024,   "kbytes",
     RLIMIT_STACK,      "stacksize",    1024,   "kbytes",
     RLIMIT_CORE,       "coredumpsize", 1024,   "kbytes",

-    RLIMIT_RSS,                "memoryuse",    1024,   "kbytes",
+    RLIMIT_RSS,                "memoryuse",    1024,   "kbytes",

     RLIMIT_MEMLOCK,    "memorylocked", 1024,   "kbytes",
     RLIMIT_NPROC,      "maxproc",      1,      "",
     RLIMIT_OFILE,      "openfiles",    1,      "",
     RLIMIT_MEMLOCK,    "memorylocked", 1024,   "kbytes",
     RLIMIT_NPROC,      "maxproc",      1,      "",
     RLIMIT_OFILE,      "openfiles",    1,      "",

-    -1,                NULL,           0,      NULL
+    -1,                        NULL,           0,      NULL

 };
 
 static struct limits *findlim();
 };
 
 static struct limits *findlim();


@@ -1255,7 +1259,7 @@ plim(lp, hard)
     else if (lp->limconst == RLIMIT_CPU)
        psecs((long) limit);
     else
     else if (lp->limconst == RLIMIT_CPU)
        psecs((long) limit);
     else

-       (void) fprintf(cshout, "%ld %s", (long) (limit / lp->limdiv), 
+       (void) fprintf(cshout, "%ld %s", (long) (limit / lp->limdiv),

                       lp->limscale);
     (void) fputc('\n', cshout);
 }
                       lp->limscale);
     (void) fputc('\n', cshout);
 }


@@ -1446,11 +1450,10 @@ doprintf(v, t)
     char **c;
     extern int progprintf __P((int, char **));
     int ret;
     char **c;
     extern int progprintf __P((int, char **));
     int ret;

-    
+

     ret = progprintf(blklen(v), c = short2blk(v));
 
     blkfree((Char **) c);
     if (ret)
        stderror(ERR_SILENT);
 }
     ret = progprintf(blklen(v), c = short2blk(v));
 
     blkfree((Char **) c);
     if (ret)
        stderror(ERR_SILENT);
 }

-

diff --git a/usr/src/bin/csh/glob.c b/usr/src/bin/csh/glob.c
index 795e7a1..e940539 100644 (file)
--- a/usr/src/bin/csh/glob.c
+++ b/usr/src/bin/csh/glob.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)glob.c     5.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)glob.c     5.30 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -74,9 +74,10 @@ globtilde(nv, s)
     gstart = gbuf;
     *gstart++ = *s++;
     u = s;
     gstart = gbuf;
     *gstart++ = *s++;
     u = s;

-    for (b = gstart, e = &gbuf[MAXPATHLEN - 1]; 
+    for (b = gstart, e = &gbuf[MAXPATHLEN - 1];

         *s && *s != '/' && *s != ':' && b < e;
         *s && *s != '/' && *s != ':' && b < e;

-        *b++ = *s++);
+        *b++ = *s++)
+        continue;

     *b = EOS;
     if (gethdir(gstart)) {
        blkfree(nv);
     *b = EOS;
     if (gethdir(gstart)) {
        blkfree(nv);


@@ -364,7 +365,7 @@ libglob(vl)
        gflgs |= GLOB_APPEND;
     }
     while (*++vl);
        gflgs |= GLOB_APPEND;
     }
     while (*++vl);

-    vl = (globv.gl_pathc == 0 || (magic && !match && !nonomatch)) ? 
+    vl = (globv.gl_pathc == 0 || (magic && !match && !nonomatch)) ?

        NULL : blk2short(globv.gl_pathv);
     globfree(&globv);
     return (vl);
        NULL : blk2short(globv.gl_pathv);
     globfree(&globv);
     return (vl);


@@ -779,8 +780,10 @@ Gcat(s1, s2)
     register Char *p, *q;
     int     n;
 
     register Char *p, *q;
     int     n;
 

-    for (p = s1; *p++;);
-    for (q = s2; *q++;);
+    for (p = s1; *p++;)
+       continue;
+    for (q = s2; *q++;)
+       continue;

     n = (p - s1) + (q - s2) - 1;
     if (++gargc >= gargsiz) {
        gargsiz += GLOBSPACE;
     n = (p - s1) + (q - s2) - 1;
     if (++gargc >= gargsiz) {
        gargsiz += GLOBSPACE;


@@ -789,8 +792,10 @@ Gcat(s1, s2)
     }
     gargv[gargc] = 0;
     p = gargv[gargc - 1] = (Char *) xmalloc((size_t) n * sizeof(Char));
     }
     gargv[gargc] = 0;
     p = gargv[gargc - 1] = (Char *) xmalloc((size_t) n * sizeof(Char));

-    for (q = s1; *p++ = *q++;);
-    for (p--, q = s2; *p++ = *q++;);
+    for (q = s1; *p++ = *q++;)
+       continue;
+    for (p--, q = s2; *p++ = *q++;)
+       continue;

 }
 
 #ifdef FILEC
 }
 
 #ifdef FILEC

diff --git a/usr/src/bin/csh/lex.c b/usr/src/bin/csh/lex.c
index 9d62789..55469c5 100644 (file)
--- a/usr/src/bin/csh/lex.c
+++ b/usr/src/bin/csh/lex.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)lex.c      5.23 (Berkeley) %G%";
+static char sccsid[] = "@(#)lex.c      5.24 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -35,19 +35,19 @@ static Char *word __P((void));
 static int      getC1 __P((int));
 static void     getdol __P((void));
 static void     getexcl __P((int));
 static int      getC1 __P((int));
 static void     getdol __P((void));
 static void     getexcl __P((int));

-static struct Hist 
+static struct Hist

                *findev __P((Char *, bool));
 static void     setexclp __P((Char *));
 static int      bgetc __P((void));
 static void     bfree __P((void));
                *findev __P((Char *, bool));
 static void     setexclp __P((Char *));
 static int      bgetc __P((void));
 static void     bfree __P((void));

-static struct wordent 
+static struct wordent

                *gethent __P((int));
 static int      matchs __P((Char *, Char *));
 static int      getsel __P((int *, int *, int));
                *gethent __P((int));
 static int      matchs __P((Char *, Char *));
 static int      getsel __P((int *, int *, int));

-static struct wordent 
+static struct wordent

                *getsub __P((struct wordent *));
                *getsub __P((struct wordent *));

-static Char    *subword __P((Char *, int, bool *));
-static struct wordent 
+static Char    *subword __P((Char *, int, bool *));
+static struct wordent

                *dosub __P((int, struct wordent *, bool));
 
 /*
                *dosub __P((int, struct wordent *, bool));
 
 /*


@@ -218,7 +218,8 @@ word()
     wp = wbuf;
     i = BUFSIZ - 4;
 loop:
     wp = wbuf;
     i = BUFSIZ - 4;
 loop:

-    while ((c = getC(DOALL)) == ' ' || c == '\t');
+    while ((c = getC(DOALL)) == ' ' || c == '\t')
+       continue;

     if (cmap(c, _META | _ESC))
        switch (c) {
        case '&':
     if (cmap(c, _META | _ESC))
        switch (c) {
        case '&':


@@ -755,7 +756,7 @@ getsub(en)
                    break;
 #ifdef notdef
                if (c == '~') {
                    break;
 #ifdef notdef
                if (c == '~') {

-                   if (&cp[Strlen(orhsb)] > &rhsb[sizeof(rhsb) / 
+                   if (&cp[Strlen(orhsb)] > &rhsb[sizeof(rhsb) /

                                                   sizeof(Char) - 2])
                        goto toorhs;
                    (void) Strcpy(cp, orhsb);
                                                   sizeof(Char) - 2])
                        goto toorhs;
                    (void) Strcpy(cp, orhsb);


@@ -1241,7 +1242,7 @@ top:
     aret = F_SEEK;
     if (alvecp) {
        aret = A_SEEK;
     aret = F_SEEK;
     if (alvecp) {
        aret = A_SEEK;

-       if (c = *alvecp++) 
+       if (c = *alvecp++)

            return (c);
        if (alvec && *alvec) {
                alvecp = *alvec++;
            return (c);
        if (alvec && *alvec) {
                alvecp = *alvec++;


@@ -1316,7 +1317,7 @@ reread:
                    tpgrp != ctpgrp) {
                    (void) tcsetpgrp(FSHTTY, tpgrp);
                    (void) killpg((pid_t) ctpgrp, SIGHUP);
                    tpgrp != ctpgrp) {
                    (void) tcsetpgrp(FSHTTY, tpgrp);
                    (void) killpg((pid_t) ctpgrp, SIGHUP);

-                   (void) fprintf(csherr, "Reset tty pgrp from %d to %d\n", 
+                   (void) fprintf(csherr, "Reset tty pgrp from %d to %d\n",

                                   ctpgrp, tpgrp);
                    goto reread;
                }
                                   ctpgrp, tpgrp);
                    goto reread;
                }


@@ -1483,7 +1484,7 @@ bseek(l)
        alvec = l->a_seek;
        alvecp = (Char *) l->f_seek;
        return;
        alvec = l->a_seek;
        alvecp = (Char *) l->f_seek;
        return;

-    case F_SEEK:       
+    case F_SEEK:

        fseekp = l->f_seek;
        return;
     default:
        fseekp = l->f_seek;
        return;
     default:

diff --git a/usr/src/bin/csh/misc.c b/usr/src/bin/csh/misc.c
index e8398f9..37f2c0d 100644 (file)
--- a/usr/src/bin/csh/misc.c
+++ b/usr/src/bin/csh/misc.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)misc.c     5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)misc.c     5.16 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -56,9 +56,11 @@ strsave(s)
 
     if (s == NULL)
        s = "";
 
     if (s == NULL)
        s = "";

-    for (p = s; *p++;);
+    for (p = s; *p++;)
+       continue;

     n = p = (char *) xmalloc((size_t) ((p - s) * sizeof(char)));
     n = p = (char *) xmalloc((size_t) ((p - s) * sizeof(char)));

-    while (*p++ = *s++);
+    while (*p++ = *s++)
+       continue;

     return (n);
 }
 
     return (n);
 }
 


@@ -175,11 +177,15 @@ strspl(cp, dp)
        cp = "";
     if (!dp)
        dp = "";
        cp = "";
     if (!dp)
        dp = "";

-    for (p = cp; *p++;);
-    for (q = dp; *q++;);
+    for (p = cp; *p++;)
+       continue;
+    for (q = dp; *q++;)
+       continue;

     ep = (char *) xmalloc((size_t) (((p - cp) + (q - dp) - 1) * sizeof(char)));
     ep = (char *) xmalloc((size_t) (((p - cp) + (q - dp) - 1) * sizeof(char)));

-    for (p = ep, q = cp; *p++ = *q++;);
-    for (p--, q = dp; *p++ = *q++;);
+    for (p = ep, q = cp; *p++ = *q++;)
+       continue;
+    for (p--, q = dp; *p++ = *q++;)
+       continue;

     return (ep);
 }
 
     return (ep);
 }
 

diff --git a/usr/src/bin/csh/proc.c b/usr/src/bin/csh/proc.c
index cb7704a..8a45287 100644 (file)
--- a/usr/src/bin/csh/proc.c
+++ b/usr/src/bin/csh/proc.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)proc.c     5.26 (Berkeley) %G%";
+static char sccsid[] = "@(#)proc.c     5.27 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -38,7 +38,7 @@ static int     pprint __P((struct process *, int));
 static void     ptprint __P((struct process *));
 static void     pads __P((Char *));
 static void     pkill __P((Char **v, int));
 static void     ptprint __P((struct process *));
 static void     pads __P((Char *));
 static void     pkill __P((Char **v, int));

-static struct  process 
+static struct  process

                *pgetcurr __P((struct process *));
 static void     okpcntl __P((void));
 
                *pgetcurr __P((struct process *));
 static void     okpcntl __P((void));
 


@@ -254,7 +254,7 @@ pjwait(pp)
        if ((jobflags & PRUNNING) == 0)
            break;
 #ifdef JOBDEBUG
        if ((jobflags & PRUNNING) == 0)
            break;
 #ifdef JOBDEBUG

-       (void) fprintf(csherr, "starting to sigpause for  SIGCHLD on %d\n", 
+       (void) fprintf(csherr, "starting to sigpause for  SIGCHLD on %d\n",

                       fp->p_pid);
 #endif                         /* JOBDEBUG */
        (void) sigpause(omask & ~sigmask(SIGCHLD));
                       fp->p_pid);
 #endif                         /* JOBDEBUG */
        (void) sigpause(omask & ~sigmask(SIGCHLD));


@@ -443,7 +443,8 @@ palloc(pid, t)
        pp->p_index = pcurrjob->p_index;
        pp->p_friends = pcurrjob;
        pp->p_jobid = pcurrjob->p_pid;
        pp->p_index = pcurrjob->p_index;
        pp->p_friends = pcurrjob;
        pp->p_jobid = pcurrjob->p_pid;

-       for (fp = pcurrjob; fp->p_friends != pcurrjob; fp = fp->p_friends);
+       for (fp = pcurrjob; fp->p_friends != pcurrjob; fp = fp->p_friends)
+           continue;

        fp->p_friends = pp;
     }
     else {
        fp->p_friends = pp;
     }
     else {


@@ -642,7 +643,7 @@ pprint(pp, flag)
     do {
        jobflags |= pp->p_flags;
        pstatus = pp->p_flags & PALLSTATES;
     do {
        jobflags |= pp->p_flags;
        pstatus = pp->p_flags & PALLSTATES;

-       if (tp != pp && !hadnl && !(flag & FANCY) && 
+       if (tp != pp && !hadnl && !(flag & FANCY) &&

            ((pstatus == status && pp->p_reason == reason) ||
             !(flag & REASON))) {
            (void) fputc(' ', cshout);
            ((pstatus == status && pp->p_reason == reason) ||
             !(flag & REASON))) {
            (void) fputc(' ', cshout);


@@ -704,7 +705,7 @@ pprint(pp, flag)
                             && reason != SIGINT
                             && (reason != SIGPIPE
                                 || (pp->p_flags & PPOU) == 0))) {
                             && reason != SIGINT
                             && (reason != SIGPIPE
                                 || (pp->p_flags & PPOU) == 0))) {

-                       (void) fprintf(cshout, format, 
+                       (void) fprintf(cshout, format,

                                       sys_siglist[pp->p_reason]);
                        hadnl = 0;
                    }
                                       sys_siglist[pp->p_reason]);
                        hadnl = 0;
                    }


@@ -949,7 +950,7 @@ dokill(v, t)
            if (!strncasecmp(name, "sig", 3))
                name += 3;
 
            if (!strncasecmp(name, "sig", 3))
                name += 3;
 

-           for (signum = 1; signum < NSIG; signum++) 
+           for (signum = 1; signum < NSIG; signum++)

                if (!strcasecmp(sys_signame[signum], name))
                    break;
 
                if (!strcasecmp(sys_signame[signum], name))
                    break;
 


@@ -1002,7 +1003,7 @@ pkill(v, signum)
            case SIGTTIN:
            case SIGTTOU:
                if ((jobflags & PRUNNING) == 0) {
            case SIGTTIN:
            case SIGTTOU:
                if ((jobflags & PRUNNING) == 0) {

-                   (void) fprintf(csherr, "%s: Already suspended\n", 
+                   (void) fprintf(csherr, "%s: Already suspended\n",

                                   short2str(cp));
                    err1++;
                    goto cont;
                                   short2str(cp));
                    err1++;
                    goto cont;


@@ -1017,7 +1018,7 @@ pkill(v, signum)
                goto cont;
            }
            if (killpg((pid_t) pp->p_jobid, signum) < 0) {
                goto cont;
            }
            if (killpg((pid_t) pp->p_jobid, signum) < 0) {

-               (void) fprintf(csherr, "%s: %s\n", short2str(cp), 
+               (void) fprintf(csherr, "%s: %s\n", short2str(cp),

                               strerror(errno));
                err1++;
            }
                               strerror(errno));
                err1++;
            }

diff --git a/usr/src/bin/csh/set.c b/usr/src/bin/csh/set.c
index 0c76921..968f614 100644 (file)
--- a/usr/src/bin/csh/set.c
+++ b/usr/src/bin/csh/set.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)set.c      5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)set.c      5.16 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -25,12 +25,12 @@ static char sccsid[] = "@(#)set.c   5.15 (Berkeley) %G%";
 
 static Char    *getinx __P((Char *, int *));
 static void     asx __P((Char *, int, Char *));
 
 static Char    *getinx __P((Char *, int *));
 static void     asx __P((Char *, int, Char *));

-static struct varent 
+static struct varent

                *getvx __P((Char *, int));
 static Char    *xset __P((Char *, Char ***));
 static Char    *operate __P((int, Char *, Char *));
 static void     putn1 __P((int));
                *getvx __P((Char *, int));
 static Char    *xset __P((Char *, Char ***));
 static Char    *operate __P((int, Char *, Char *));
 static void     putn1 __P((int));

-static struct varent 
+static struct varent

                *madrof __P((Char *, struct varent *));
 static void     unsetv1 __P((struct varent *));
 static void     exportpath __P((Char **));
                *madrof __P((Char *, struct varent *));
 static void     unsetv1 __P((struct varent *));
 static void     exportpath __P((Char **));


@@ -571,7 +571,8 @@ unsetv1(p)
     else if (p->v_left == 0)
        c = p->v_right;
     else {
     else if (p->v_left == 0)
        c = p->v_right;
     else {

-       for (c = p->v_left; c->v_right; c = c->v_right);
+       for (c = p->v_left; c->v_right; c = c->v_right)
+           continue;

        p->v_name = c->v_name;
        p->vec = c->vec;
        p = c;
        p->v_name = c->v_name;
        p->vec = c->vec;
        p = c;

diff --git a/usr/src/bin/csh/str.c b/usr/src/bin/csh/str.c
index 46e8e8d..80ee66f 100644 (file)
--- a/usr/src/bin/csh/str.c
+++ b/usr/src/bin/csh/str.c
@@ -6,14 +6,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)str.c      5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      5.9 (Berkeley) %G%";

 #endif /* not lint */
 
 #define MALLOC_INCR    128
 
 /*
  * tc.str.c: Short string package
 #endif /* not lint */
 
 #define MALLOC_INCR    128
 
 /*
  * tc.str.c: Short string package

- *          This has been a lesson of how to write buggy code!
+ *          This has been a lesson of how to write buggy code!

  */
 
 #if __STDC__
  */
 
 #if __STDC__


@@ -37,7 +37,8 @@ blk2short(src)
     /*
      * Count
      */
     /*
      * Count
      */

-    for (n = 0; src[n] != NULL; n++);
+    for (n = 0; src[n] != NULL; n++)
+       continue;

     sdst = dst = (Char **) xmalloc((size_t) ((n + 1) * sizeof(Char *)));
 
     for (; *src != NULL; src++)
     sdst = dst = (Char **) xmalloc((size_t) ((n + 1) * sizeof(Char *)));
 
     for (; *src != NULL; src++)


@@ -56,7 +57,8 @@ short2blk(src)
     /*
      * Count
      */
     /*
      * Count
      */

-    for (n = 0; src[n] != NULL; n++);
+    for (n = 0; src[n] != NULL; n++)
+       continue;

     sdst = dst = (char **) xmalloc((size_t) ((n + 1) * sizeof(char *)));
 
     for (; *src != NULL; src++)
     sdst = dst = (char **) xmalloc((size_t) ((n + 1) * sizeof(char *)));
 
     for (; *src != NULL; src++)


@@ -135,7 +137,8 @@ s_strcpy(dst, src)
     register Char *sdst;
 
     sdst = dst;
     register Char *sdst;
 
     sdst = dst;

-    while (*dst++ = *src++);
+    while (*dst++ = *src++)
+       continue;

     return (sdst);
 }
 
     return (sdst);
 }
 


@@ -150,7 +153,7 @@ s_strncpy(dst, src, n)
        return(dst);
 
     sdst = dst;
        return(dst);
 
     sdst = dst;

-    do 
+    do

        if ((*dst++ = *src++) == '\0') {
            while (--n != 0)
                *dst++ = '\0';
        if ((*dst++ = *src++) == '\0') {
            while (--n != 0)
                *dst++ = '\0';


@@ -167,9 +170,11 @@ s_strcat(dst, src)
     register short *sdst;
 
     sdst = dst;
     register short *sdst;
 
     sdst = dst;

-    while (*dst++);
+    while (*dst++)
+       continue;

     --dst;
     --dst;

-    while (*dst++ = *src++);
+    while (*dst++ = *src++)
+       continue;

     return (sdst);
 }
 
     return (sdst);
 }
 


@@ -181,18 +186,20 @@ s_strncat(dst, src, n)
 {
     register Char *sdst;
 
 {
     register Char *sdst;
 

-    if (n == 0) 
+    if (n == 0)

        return (dst);
 
     sdst = dst;
 
        return (dst);
 
     sdst = dst;
 

-    while (*dst++);
+    while (*dst++)
+       continue;

     --dst;
 
     --dst;
 

-    do 
+    do

        if ((*dst++ = *src++) == '\0')
            return(sdst);
        if ((*dst++ = *src++) == '\0')
            return(sdst);

-    while (--n != 0);
+    while (--n != 0)
+       continue;

 
     *dst = '\0';
     return (sdst);
 
     *dst = '\0';
     return (sdst);


@@ -233,7 +240,8 @@ s_strlen(str)
 {
     register size_t n;
 
 {
     register size_t n;
 

-    for (n = 0; *str++; n++);
+    for (n = 0; *str++; n++)
+       continue;

     return (n);
 }
 
     return (n);
 }
 


@@ -241,7 +249,8 @@ int
 s_strcmp(str1, str2)
     register Char *str1, *str2;
 {
 s_strcmp(str1, str2)
     register Char *str1, *str2;
 {

-    for (; *str1 && *str1 == *str2; str1++, str2++);
+    for (; *str1 && *str1 == *str2; str1++, str2++)
+       continue;

     /*
      * The following case analysis is necessary so that characters which look
      * negative collate low against normal characters but high against the
     /*
      * The following case analysis is necessary so that characters which look
      * negative collate low against normal characters but high against the


@@ -267,7 +276,7 @@ s_strncmp(str1, str2, n)
     do {
        if (*str1 != *str2) {
            /*
     do {
        if (*str1 != *str2) {
            /*

-            * The following case analysis is necessary so that characters 
+            * The following case analysis is necessary so that characters

             * which look negative collate low against normal characters
             * but high against the end-of-string NUL.
             */
             * which look negative collate low against normal characters
             * but high against the end-of-string NUL.
             */


@@ -295,9 +304,11 @@ s_strsave(s)
 
     if (s == 0)
        s = STRNULL;
 
     if (s == 0)
        s = STRNULL;

-    for (p = s; *p++;);
+    for (p = s; *p++;)
+       continue;

     n = p = (Char *) xmalloc((size_t) ((p - s) * sizeof(Char)));
     n = p = (Char *) xmalloc((size_t) ((p - s) * sizeof(Char)));

-    while (*p++ = *s++);
+    while (*p++ = *s++)
+       continue;

     return (n);
 }
 
     return (n);
 }
 


@@ -312,12 +323,16 @@ s_strspl(cp, dp)
        cp = STRNULL;
     if (!dp)
        dp = STRNULL;
        cp = STRNULL;
     if (!dp)
        dp = STRNULL;

-    for (p = cp; *p++;);
-    for (q = dp; *q++;);
+    for (p = cp; *p++;)
+       continue;
+    for (q = dp; *q++;)
+       continue;

     ep = (Char *) xmalloc((size_t)
                          (((p - cp) + (q - dp) - 1) * sizeof(Char)));
     ep = (Char *) xmalloc((size_t)
                          (((p - cp) + (q - dp) - 1) * sizeof(Char)));

-    for (p = ep, q = cp; *p++ = *q++;);
-    for (p--, q = dp; *p++ = *q++;);
+    for (p = ep, q = cp; *p++ = *q++;)
+       continue;
+    for (p--, q = dp; *p++ = *q++;)
+       continue;

     return (ep);
 }
 
     return (ep);
 }