Changeset 3145 for trunk/src

Timestamp:

Mar 15, 2018, 1:00:09 AM (8 years ago)

Author:

bird

Message:

kmk: warnings found by gcc 7.3.0

Location:

trunk/src/kmk

Files:

• function.c (modified) (2 diffs)
• kmkbuiltin/cp.c (modified) (1 diff)
• kmkbuiltin/fts.c (modified) (1 diff)
• kmkbuiltin/install.c (modified) (1 diff)
• kmkbuiltin/printf.c (modified) (1 diff)
• kmkbuiltin/redirect.c (modified) (1 diff)
• read.c (modified) (1 diff)

trunk/src/kmk/function.c

@@ -3295 +3295 @@
 
   /* second: the command for the subsequent command lines. defaults to the initial cmd. */
-  subsequent_cmd = argc > 2 && argv[1][0] != '\0' ? argv[1] : "";
+  subsequent_cmd = argc > 2 && argv[1][0] != '\0' ? argv[1] : "\0";
   while (ISSPACE (*subsequent_cmd))
-    subsequent_cmd++;
+    subsequent_cmd++;   /* gcc 7.3.0 complains "offset ‘1’ outside bounds of constant string" if constant is "" rather than "\0". */
   if (*subsequent_cmd)
     {
@@ -3311 +3311 @@
 
   /* third: the final command. defaults to the subseq cmd. */
-  final_cmd = argc > 3 && argv[2][0] != '\0' ? argv[2] : "";
+  final_cmd = argc > 3 && argv[2][0] != '\0' ? argv[2] : "\0";
   while (ISSPACE (*final_cmd))
-    final_cmd++;
+    final_cmd++;    /* gcc 7.3.0: same complaint as for subsequent_cmd++ */
   if (*final_cmd)
     {

trunk/src/kmk/kmkbuiltin/cp.c

@@ -427 +427 @@
                                 continue;
                         }
+                        /* fall thru */
                 case FTS_DNR:
                 case FTS_ERR:

trunk/src/kmk/kmkbuiltin/fts.c

@@ -1424 +1424 @@
 
 #ifdef HAVE_FCHDIR
-        if (oldfd < 0 && (fd = open(path, O_RDONLY)) == -1)
-                return -1;
+        if (oldfd < 0) {
+                if (!path) /* shuts up gcc nonull checks*/
+                        return -1;
+                fd = open(path, O_RDONLY);
+                if (fd == -1)
+                        return -1;
+        }
 
         if (fstat(fd, &sb) == -1)

trunk/src/kmk/kmkbuiltin/install.c

@@ -32 +32 @@
  */
 
-#ifndef lint
+#if 0 /*ndef lint*/
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993\n\

trunk/src/kmk/kmkbuiltin/printf.c

@@ -84 +84 @@
 
 
-#ifdef __GNUC__
+#if 0 /*def __GNUC__ - bird: gcc complains about non-ISO-standard escape. */
 #define ESCAPE '\e'
 #else

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -1567 +1567 @@
                             break;
                         }
+                        /* fall thru */
                     case '1':
                     case '2':

trunk/src/kmk/read.c

@@ -3395 +3395 @@
           break;
         }
+      /* fall thru */
 
     default: