imagex_optimize(), imagex_update(): Check if file writable first

diff --git a/programs/imagex.c b/programs/imagex.c
index b45d2d4b99232e0c2d1ba4daf3445318d58967e5..7dbbc8a4330addd60c8a1f668d62853996ff4e37 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -2784,9 +2784,13 @@ imagex_optimize(int argc, tchar **argv)
 
        wimfile = argv[0];
 
 
        wimfile = argv[0];
 

+       ret = file_writable(wimfile);
+       if (ret)
+               return ret;
+

        ret = wimlib_open_wim(wimfile, open_flags, &w,
                              imagex_progress_func);
        ret = wimlib_open_wim(wimfile, open_flags, &w,
                              imagex_progress_func);

-       if (ret != 0)
+       if (ret)

                return ret;
 
        old_size = file_get_size(argv[0]);
                return ret;
 
        old_size = file_get_size(argv[0]);


@@ -2987,6 +2991,11 @@ imagex_update(int argc, tchar **argv)
        if (argc < 1 || argc > 2)
                goto out_usage;
        wimfile = argv[0];
        if (argc < 1 || argc > 2)
                goto out_usage;
        wimfile = argv[0];

+
+       ret = file_writable(wimfile);
+       if (ret)
+               goto out;
+

        ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func);
        if (ret)
                goto out;
        ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func);
        if (ret)
                goto out;