Changeset 2494

Timestamp:

Dec 18, 2005, 8:43:00 AM (20 years ago)

Author:

bird

Message:

o Don't display usage() on failure, just the error message.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/emxomf/emxomfld.c (modified) (6 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -4 +4 @@
 
 2005-12-18: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - emxomfld:
+        o Don't display usage() on failure, just the error message.
     - *:
         o Changed version to 0.6.1 and create the libc06.dll forwarder.

branches/libc-0.6/src/emx/src/emxomf/emxomfld.c

@@ -1496 +1496 @@
                   fprintf (stderr,
                            "emxomfld: multiple module definition files\n");
-                  usage ();
+                  return 1;
                 }
               def_fname = _realrealpath(optarg, NULL, 0);
@@ -1512 +1512 @@
                   fprintf (stderr,
                            "emxomfld: multiple binary resource files\n");
-                  usage ();
+                  return 1;
                 }
               res_fname = _realrealpath(optarg, NULL, 0);
@@ -1585 +1585 @@
                 {
                   fprintf (stderr, "emxomfld: multiple map files files\n");
-                  usage ();
+                  return 1;
                 }
             map_fname = optarg;
@@ -1593 +1593 @@
         case OPT_ZSTACK:
           if (!optarg)
-            usage ();
+            return 1;
           errno = 0;
           stack_size = strtol (optarg, &t, 0);
           if (errno != 0 || *t != 0 || t == optarg)
-            usage ();
+            return 1;
           break;
 
@@ -1622 +1622 @@
           if (optind > 1)
             fprintf (stderr, "emxomfld: invalid option (%s)\n", argv[optind - 1]);
-          usage ();
+          else
+            usage ();
+          return 1;
         }
     }
@@ -1639 +1641 @@
     {
       fprintf (stderr, "emxomfld: no input files\n");
-      usage ();
+      return 1;
     }