]> wimlib.net Git - wimlib/blobdiff - programs/imagex.c
ENOENT fix
[wimlib] / programs / imagex.c
index d41964a22ba384b9bd514b3c7209c8eae8546df9..5c5d42bc0733e444f8095059afca97c5a257bebb 100644 (file)
 #include <errno.h>
 #include <sys/stat.h>
 
-#ifdef WITH_NTFS_3G
-#include <unistd.h>
-#include <sys/wait.h>
-#endif
-
 #define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0]))
 
 #define swap(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
@@ -80,26 +75,26 @@ static const char *path_basename(const char *path)
 
 static const char *usage_strings[] = {
 [APPEND] = 
-"    imagex append (DIRECTORY | NTFS_VOLUME) WIMFILE [\"IMAGE_NAME\"]\n"
-"                  [\"DESCRIPTION\"] [--boot] [--check] [--flags EDITIONID]\n"
+"    imagex append (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n"
+"                  [DESCRIPTION] [--boot] [--check] [--flags EDITION_ID]\n"
 "                  [--verbose] [--dereference] [--config=FILE]\n",
 [APPLY] = 
 "    imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n"
 "                 (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n"
 "                 [--symlink] [--verbose]\n",
 [CAPTURE] = 
-"    imagex capture (DIRECTORY | NTFS_VOLUME) WIMFILE [\"IMAGE_NAME\"]\n"
-"                   [\"DESCRIPTION\"] [--boot] [--check] [--compress=TYPE]\n"
-"                   [--flags \"EditionID\"] [--verbose] [--dereference]\n"
+"    imagex capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n"
+"                   [DESCRIPTION] [--boot] [--check] [--compress=TYPE]\n"
+"                   [--flags EDITION_ID] [--verbose] [--dereference]\n"
 "                   [--config=FILE]\n",
 [DELETE] = 
 "    imagex delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n",
 [DIR] = 
-"    imagex dir WIMFILE (IMAGE_NUM | IMAGE_NAME | \"all\")\n",
+"    imagex dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n",
 [EXPORT] = 
 "    imagex export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n"
-"                  DEST_WIMFILE [\"DEST_IMAGE_NAME\"]\n"
-"                  [\"DEST_IMAGE_DESCRIPTION\"] [--boot] [--check]\n"
+"                  DEST_WIMFILE [DEST_IMAGE_NAME]\n"
+"                  [DEST_IMAGE_DESCRIPTION] [--boot] [--check]\n"
 "                  [--compress=TYPE]\n",
 [INFO] = 
 "    imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n"
@@ -418,7 +413,7 @@ static int imagex_append(int argc, const char **argv)
                        goto out_write;
                }
        } else {
-               if (errno != -ENOENT)
+               if (errno != ENOENT)
                        imagex_error_with_errno("Failed to stat `%s'", dir);
        }
 #endif
@@ -527,7 +522,7 @@ static int imagex_apply(int argc, const char **argv)
                        goto out;
                }
        } else {
-               if (errno != -ENOENT)
+               if (errno != ENOENT)
                        imagex_error_with_errno("Failed to stat `%s'", dir);
        }
 #endif
@@ -628,7 +623,7 @@ static int imagex_capture(int argc, const char **argv)
                        goto out_write;
                }
        } else {
-               if (errno != -ENOENT)
+               if (errno != ENOENT)
                        imagex_error_with_errno("Failed to stat `%s'", dir);
        }
 #endif