wimapply.c: Fix extract flags

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index f2757820fcaeea7a1b3670a4f53113c151a13f81..f7d8b66558389d97e16b7b16086588d1ebf37a34 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -101,7 +101,7 @@ static const char *usage_strings[] = {
 "                      [--check] [--debug] [--streams-interface=INTERFACE]\n"
 "                      [--staging-dir=DIR]\n",
 [OPTIMIZE] =
-"imagex optimize WIMFILE [--check] [--recompress]\n",
+"imagex optimize WIMFILE [--check] [--recompress] [--compress=TYPE]\n",
 [SPLIT] =
 "imagex split WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n",
 [UNMOUNT] =
@@ -398,15 +398,21 @@ static int imagex_progress_func(enum wimlib_progress_msg msg,
                        putchar('\n');
                break;
        case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_BEGIN:
-               /*printf("Applying image %d (%s) to `%s'\n",*/
-                      /*info->extract.image,*/
-                      /*info->extract.image_name,*/
-                      /*info->extract.target);*/
+               printf("Applying image %d (%s) from `%s' to %s `%s'\n",
+                      info->extract.image,
+                      info->extract.image_name,
+                      info->extract.wimfile_name,
+                      ((info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) ?
+                               "NTFS volume" : "directory"),
+                      info->extract.target);
+               break;
+       case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END:
+               printf("Done applying WIM image.\n");
+               if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
+                       printf("Unmounting NTFS volume `%s'...\n",
+                              info->extract.target);
+               }
                break;
-       /*case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END:*/
-               /*printf("Done applying image %d!\n",*/
-                      /*info->extract.image);*/
-               /*break;*/
        /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/
                /*printf("Applying directory structure to %s\n",*/
                       /*info->extract.target);*/
@@ -617,11 +623,8 @@ static int imagex_apply(int argc, const char **argv)
 
        ret = stat(target, &stbuf);
        if (ret == 0) {
-               if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) {
+               if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode))
                        extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS;
-                       printf("Applying `%s' image %d to NTFS volume `%s'\n",
-                              wimfile, image, target);
-               }
        } else {
                if (errno != ENOENT) {
                        imagex_error_with_errno("Failed to stat `%s'", target);
@@ -1539,19 +1542,21 @@ static int imagex_optimize(int argc, const char **argv)
 
        ret = wimlib_overwrite(w, write_flags, 0, imagex_progress_func);
 
-       new_size = file_get_size(argv[0]);
-       printf("`%s' optimized size: ", wimfile);
-       if (new_size == -1)
-               puts("Unknown");
-       else
-               printf("%"PRIu64" KiB\n", new_size >> 10);
+       if (ret == 0) {
+               new_size = file_get_size(argv[0]);
+               printf("`%s' optimized size: ", wimfile);
+               if (new_size == -1)
+                       puts("Unknown");
+               else
+                       printf("%"PRIu64" KiB\n", new_size >> 10);
 
-       fputs("Space saved: ", stdout);
-       if (new_size != -1 && old_size != -1) {
-               printf("%lld KiB\n",
-                      ((long long)old_size - (long long)new_size) >> 10);
-       } else {
-               puts("Unknown");
+               fputs("Space saved: ", stdout);
+               if (new_size != -1 && old_size != -1) {
+                       printf("%lld KiB\n",
+                              ((long long)old_size - (long long)new_size) >> 10);
+               } else {
+                       puts("Unknown");
+               }
        }
 
        wimlib_free(w);