]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Add initial functionality to support -q
authorsenhuang42 <senhuang96@fb.com>
Tue, 25 Aug 2020 17:50:44 +0000 (13:50 -0400)
committersenhuang42 <senhuang96@fb.com>
Tue, 25 Aug 2020 17:50:44 +0000 (13:50 -0400)
programs/fileio.c

index 9eb35fa8f228211ac5699c27a00d624a06a29346..f2978fe8babc5db8ae4b32cabf41a0a3d1c08ce9 100644 (file)
@@ -1672,14 +1672,23 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs,
     assert(outFileName != NULL || suffix != NULL);
     if (outFileName != NULL) {   /* output into a single destination (stdout typically) */
         if (nbFiles > 1 && !prefs->overwrite) {
-            if (!strcmp (outFileName, stdoutmark)) {
-                DISPLAY("zstd: WARNING: all input files will be processed and concatenated into stdout. ");
+            /* g_display_prefs.displayLevel <= 1 corresponds to -q flag */
+            DISPLAY("%d\n", g_display_prefs.displayLevel);
+            if (g_display_prefs.displayLevel <= 1) {
+                if (prefs->removeSrcFile) {
+                    DISPLAY("zstd: Aborting... not deleting files and processing into dst: %s", outFileName);
+                    return 1;
+                }
             } else {
-                DISPLAY("zstd: WARNING: all input files will be processed and concatenated into a single output file: %s ", outFileName);
+                if (!strcmp (outFileName, stdoutmark)) {
+                    DISPLAY("zstd: WARNING: all input files will be processed and concatenated into stdout. ");
+                } else {
+                    DISPLAY("zstd: WARNING: all input files will be processed and concatenated into a single output file: %s ", outFileName);
+                }
+                if (prefs->removeSrcFile)
+                    error = g_display_prefs.displayLevel > 1 && UTIL_requireUserConfirmationToProceed("Proceed? (y/n): ", "Aborting...", "yY");
+                DISPLAY("\n");
             }
-            if (prefs->removeSrcFile)
-                error = UTIL_requireUserConfirmationToProceed("Proceed? (y/n): ", "Aborting...", "yY");
-            DISPLAY("\n");
         }
         ress.dstFile = FIO_openDstFile(prefs, NULL, outFileName);
         if (ress.dstFile == NULL) {  /* could not open outFileName */