Changeset 22 for trunk/src/sh_getopt.c

Timestamp:

Feb 23, 2006, 12:03:58 AM (19 years ago)

Author:

rainer

Message:

Minor code revisions.

File:

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

trunk/src/sh_getopt.c

@@ -391 +391 @@
     if (op_table[i].hasArg == HAS_ARG_NO) {
       if (sl_strlen(op_table[i].longopt) < 10) 
-        strcpy(fmt,_("%c%c%c        --%-s,\t\t\t %s\n"));/* known to fit  */
+        sl_strlcpy(fmt,_("%c%c%c        --%-s,\t\t\t %s\n"), sizeof(fmt));
       else if (sl_strlen(op_table[i].longopt) < 17)
-        strcpy(fmt, _("%c%c%c        --%-s,\t\t %s\n")); /* known to fit  */
+        sl_strlcpy(fmt, _("%c%c%c        --%-s,\t\t %s\n"), sizeof(fmt));
       else 
-        strcpy(fmt, _("%c%c%c        --%-s,\t %s\n"));   /* known to fit  */
-      /*@-formatconst@*/
-      fprintf (stdout,
-               fmt,
+        sl_strlcpy(fmt, _("%c%c%c        --%-s,\t %s\n"), sizeof(fmt));
+      /* flawfinder: ignore */
+      fprintf (stdout, fmt,
                (op_table[i].shortopt == '-') ? ' ' : '-',
                (op_table[i].shortopt == '-') ? ' ' : op_table[i].shortopt,
@@ -404 +403 @@
                _(op_table[i].longopt),
                _(op_table[i].usage));
-      /*@+formatconst@*/
     } else {
       if (sl_strlen(op_table[i].longopt) < 12) 
-        strcpy(fmt,                                      /* known to fit  */
-               _("%c%c %s  --%-s=<arg>,\t\t %s\n"));  
+        sl_strlcpy(fmt, _("%c%c %s  --%-s=<arg>,\t\t %s\n"), sizeof(fmt));  
       else 
-        strcpy(fmt,                                      /* known to fit  */ 
-               _("%c%c %s  --%-s=<arg>,\t %s\n"));   
-      /*@-formatconst@*/
-      fprintf (stdout,
-               fmt,
+        sl_strlcpy(fmt, _("%c%c %s  --%-s=<arg>,\t %s\n"), sizeof(fmt));   
+      /* flawfinder: ignore */
+      fprintf (stdout, fmt,
                (op_table[i].shortopt == '-') ? ' ' : '-',
                (op_table[i].shortopt == '-') ? ' ' : op_table[i].shortopt,
@@ -420 +415 @@
                _(op_table[i].longopt),
                _(op_table[i].usage));
-      /*@+formatconst@*/
     }
   }