Changeset 173 for trunk/src

Timestamp:

Oct 13, 2004, 6:01:50 PM (21 years ago)

Author:

bird

Message:

quiet option and objname option.

Location:

trunk/src/makedep

Files:

• main.c (modified) (6 diffs)
• pr.c (modified) (2 diffs)

trunk/src/makedep/main.c

@@ -104 +104 @@
 static int      cmdinc_count = 0;
 static char     *cmdinc_list[ 2 * MAXINCFILES ];
+int             quiet = 0;              /* bird */
+char            *objname = NULL;        /* bird */
 char            *objprefix = "";
 char            *objsuffix = OBJSUFFIX;
@@ -292 +294 @@
                         break;
                 case 'o':
+#if 0 /* bird: -o is output filename. */
                         if (endmarker) break;
                         if (argv[0][2] == '\0') {
@@ -309 +312 @@
                                 objprefix = argv[0]+2;
                         break;
+#else
+                        if (endmarker) break;
+                        if (argv[0][2] == '\0') {
+                                argv++;
+                                argc--;
+                                objname = argv[0];
+                        } else
+                                objname = argv[0]+2;
+                        break;
+#endif 
+                case 'q':
+                        if (endmarker) break;
+                        quiet = TRUE;
+                        verbose = FALSE;
+                        break;
+
                 case 'v':
                         if (endmarker) break;
@@ -846 +865 @@
 {
         va_list args;
-        fprintf(stderr, "%s: error:  ", ProgramName);
+        fprintf(stderr, "%s: error:  ", ProgramName);
         va_start(args, msg);
         vfprintf(stderr, msg, args);
@@ -856 +875 @@
 warning(char *msg, ...)
 {
-        va_list args;
-        fprintf(stderr, "%s: warning:  ", ProgramName);
-        va_start(args, msg);
-        vfprintf(stderr, msg, args);
-        va_end(args);
+        if (!quiet)
+        {
+                va_list args;
+                fprintf(stderr, "%s: warning:  ", ProgramName);
+                va_start(args, msg);
+                vfprintf(stderr, msg, args);
+                va_end(args);
+        }
 }
 
@@ -866 +888 @@
 warning1(char *msg, ...)
 {
-        va_list args;
-        va_start(args, msg);
-        vfprintf(stderr, msg, args);
-        va_end(args);
-}
+        if (!quiet)
+        {
+                va_list args;
+                va_start(args, msg);
+                vfprintf(stderr, msg, args);
+                va_end(args);
+        }
+}

trunk/src/makedep/pr.c

@@ -31 +31 @@
 extern struct   inclist inclist[ MAXFILES ],
                         *inclistp;
+extern char     *objname; /* bird */
 extern char     *objprefix;
 extern char     *objsuffix;
@@ -87 +88 @@
         if (current_len + len > width || file != lastfile) {
                 lastfile = file;
-                sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
-                        ip->i_file);
+                if (objname)
+                        sprintf(buf, "\n%s: %s", objname, ip->i_file);
+                else
+                        sprintf(buf, "\n%s%s%s: %s", objprefix, base, 
+                                objsuffix, ip->i_file);
                 len = current_len = strlen(buf);
         }