Changeset 1393 in kBuild

Timestamp:

Mar 7, 2008 2:05:46 AM (17 years ago)

Author:

bird

Message:

Added an --output/-o option for use with -p.

File:

• trunk/src/kmk/kmkbuiltin/md5sum.c (modified) (8 diffs)

trunk/src/kmk/kmkbuiltin/md5sum.c

@@ -48 +48 @@
 {
     fprintf(pOut,
-            "usage: md5sum [-bt] file(s)\n"
+            "usage: md5sum [-bt] [-o list-file] file(s)\n"
             "   or: md5sum [-btwq] -c list-file(s)\n"
             "   or: md5sum [-btq] -C MD5 file\n"
@@ -59 +59 @@
             " -t, --text        Read files in text mode.\n"
             " -p, --progress    Show progress indicator on large files.\n"
+            " -o, --output      Name of the output list file. Useful with -p.\n"
             " -q, --status      Be quiet.\n"
             " -w, --warn        Ignored. Always warn, unless quiet.\n"
@@ -558 +559 @@
  * @param   fQuiet          Whether to be quiet or verbose about errors.
  * @param   fProgress       Whether to show an progress indicator on large files.
- */
-static int md5sum_file(const char *pszFilename, unsigned fText, unsigned fQuiet, unsigned fProgress)
+ * @param   pOutput         Where to write the list. Progress is always written to stdout. 
+ */
+static int md5sum_file(const char *pszFilename, unsigned fText, unsigned fQuiet, unsigned fProgress, FILE *pOutput)
 {
     int rc;
@@ -571 +573 @@
     {
         unsigned char Digest[16];
+
+        if (fProgress && pOutput)
+            fprintf(stdout, "%s: ", pszFilename);
+
         rc = calc_md5sum(pvFile, Digest, fProgress);
         close_file(pvFile);
+
+        if (fProgress && pOutput)
+        {
+            size_t cch = strlen(pszFilename) + 2;
+            while (cch-- > 0)
+                fputc('\b', stdout);
+        }
+
         if (!rc)
         {
             char szDigest[36];
             digest_to_string(Digest, szDigest);
+            if (pOutput)
+            {
+                fprintf(pOutput, "%s %s%s\n", szDigest, fText ? "" : "*", pszFilename);
+                fflush(pOutput);
+            }
             fprintf(stdout, "%s %s%s\n", szDigest, fText ? "" : "*", pszFilename);
             fflush(stdout);
@@ -613 +632 @@
     int fProgress = 0;
     int fNoMoreOptions = 0;
+    const char *pszOutput = NULL;
+    FILE *pOutput = NULL;
 
     g_progname = argv[0];
@@ -646 +667 @@
                 else if (!strcmp(psz, "-check-file"))
                     psz = "C";
+                else if (!strcmp(psz, "-output"))
+                    psz = "o";
                 else if (!strcmp(psz, "-progress"))
                     psz = "p";
@@ -726 +749 @@
                     }
 
+                    /*
+                     * Output file.
+                     */
+                    case 'o':
+                    {
+                        if (fChecking)
+                        {
+                            errx(1, "'-o' cannot be used with -c or -C!");
+                            return 1;
+                        }
+
+                        if (psz[1])
+                            pszOutput = &psz[1];
+                        else if (i + 1 < argc)
+                            pszOutput = argv[++i];
+                        else
+                        {
+                            errx(1, "'-o' is missing the file name!");
+                            return 1;
+                        }
+
+                        psz = "\0";
+                        break;
+                    }
+
                     default:
                         errx(1, "Invalid option '%c'! (%s)", *psz, argv[i]);
@@ -735 +783 @@
             rc |= check_files(argv[i], fText, fBinaryTextOpt, fQuiet, fProgress && !fQuiet);
         else
-            rc |= md5sum_file(argv[i], fText, fQuiet, fProgress && !fQuiet);
+        {
+            /* lazily open the output if specified. */
+            if (pszOutput)
+            {
+                if (pOutput)
+                    fclose(pOutput);
+                pOutput = fopen(pszOutput, "w");
+                if (!pOutput)
+                {
+                    rc = err(1, "fopen(\"%s\", \"w\") failed", pszOutput);
+                    break;
+                }
+                pszOutput = NULL;
+            }
+
+            rc |= md5sum_file(argv[i], fText, fQuiet, fProgress && !fQuiet, pOutput);
+        }
         i++;
     }
 
+    if (pOutput)
+        fclose(pOutput);
     return rc;
 }