Changes in trunk/src/sh_getopt.c [27:20]

File:

• trunk/src/sh_getopt.c (modified) (7 diffs)

trunk/src/sh_getopt.c

@@ -80 +80 @@
     sh_util_set_interactive },
 #endif
-#if defined(SH_WITH_SERVER) || defined(SH_WITH_CLIENT)
-  { N_("server-port"),  
-    '-', 
-    N_("Set the server port to connect to"),  
-    HAS_ARG_YES, 
-    sh_forward_server_port },
-#endif
 #ifdef SH_WITH_SERVER
   { N_("server"),  
@@ -119 +112 @@
     HAS_ARG_YES, 
     sh_calls_set_bind_addr },
-#if defined(SH_WITH_SERVER) || defined(SH_WITH_CLIENT)
+#ifdef SH_WITH_CLIENT
   { N_("set-export-severity"),  
     'e', 
@@ -398 +391 @@
     if (op_table[i].hasArg == HAS_ARG_NO) {
       if (sl_strlen(op_table[i].longopt) < 10) 
-        sl_strlcpy(fmt,_("%c%c%c        --%-s,\t\t\t %s\n"), sizeof(fmt));
+        strcpy(fmt,_("%c%c%c        --%-s,\t\t\t %s\n"));/* known to fit  */
       else if (sl_strlen(op_table[i].longopt) < 17)
-        sl_strlcpy(fmt, _("%c%c%c        --%-s,\t\t %s\n"), sizeof(fmt));
+        strcpy(fmt, _("%c%c%c        --%-s,\t\t %s\n")); /* known to fit  */
       else 
-        sl_strlcpy(fmt, _("%c%c%c        --%-s,\t %s\n"), sizeof(fmt));
-      /* flawfinder: ignore */
-      fprintf (stdout, fmt,
+        strcpy(fmt, _("%c%c%c        --%-s,\t %s\n"));   /* known to fit  */
+      /*@-formatconst@*/
+      fprintf (stdout,
+               fmt,
                (op_table[i].shortopt == '-') ? ' ' : '-',
                (op_table[i].shortopt == '-') ? ' ' : op_table[i].shortopt,
@@ -410 +404 @@
                _(op_table[i].longopt),
                _(op_table[i].usage));
+      /*@+formatconst@*/
     } else {
       if (sl_strlen(op_table[i].longopt) < 12) 
-        sl_strlcpy(fmt, _("%c%c %s  --%-s=<arg>,\t\t %s\n"), sizeof(fmt));  
+        strcpy(fmt,                                      /* known to fit  */
+               _("%c%c %s  --%-s=<arg>,\t\t %s\n"));  
       else 
-        sl_strlcpy(fmt, _("%c%c %s  --%-s=<arg>,\t %s\n"), sizeof(fmt));   
-      /* flawfinder: ignore */
-      fprintf (stdout, fmt,
+        strcpy(fmt,                                      /* known to fit  */ 
+               _("%c%c %s  --%-s=<arg>,\t %s\n"));   
+      /*@-formatconst@*/
+      fprintf (stdout,
+               fmt,
                (op_table[i].shortopt == '-') ? ' ' : '-',
                (op_table[i].shortopt == '-') ? ' ' : op_table[i].shortopt,
@@ -422 +420 @@
                _(op_table[i].longopt),
                _(op_table[i].usage));
+      /*@+formatconst@*/
     }
   }
@@ -561 +560 @@
           for (i = 0; op_table[i].longopt != NULL; ++i) 
             {
-
+      
               if (sl_strncmp(_(op_table[i].longopt), 
                              &argv[1][2], 
@@ -569 +568 @@
                   if ( op_table[i].hasArg == HAS_ARG_YES ) 
                     {
-                      theequal = strchr(argv[1], '=');
-                      if (theequal == NULL) 
+                      if ( (theequal = strchr(argv[1], '=')) == NULL) 
                         { 
                           if (argc < 3)