osu: Modify to do nothing if no argument passed

Previously, if osu command executed without any options, upgrade is
triggered.
This behavior may lead to mistake, the osu command modified to trigger
upgrade only with --update option.
Without any options, help page will be printed and return 1.

Change-Id: I0ada77d5ecca92cdc16851e4d3b9a504416bb64c
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/tools/osu/osu.c b/tools/osu/osu.c
index 744ba47d914cb506b2842c5c34efc90b94c8b356..032240330918c4c87124b19089455da30f881695 100644 (file)
--- a/tools/osu/osu.c
+++ b/tools/osu/osu.c
@@ -40,7 +40,7 @@ static int parse_args(int argc, char **argv, struct arguments *args)
        assert(args);
 
        args->resize = false;
-       args->update = true;
+       args->update = false;
 
        struct option long_options[] = {
                {"resize", no_argument, NULL, 'r'},
@@ -51,8 +51,6 @@ static int parse_args(int argc, char **argv, struct arguments *args)
 
        int opt;
        while ((opt = getopt_long_only(argc, argv, "rh", long_options, NULL)) !=-1) {
-               args->update = false;
-
                switch (opt) {
                        case 'r': {
                                args->resize = true;
@@ -73,7 +71,9 @@ static int parse_args(int argc, char **argv, struct arguments *args)
                }
        }
 
-       return 0;
+       print_help(argv[0]);
+
+       return 1;
 }
 
 static void print_help(char *my_name)
@@ -81,13 +81,12 @@ static void print_help(char *my_name)
        assert(my_name);
 
        printf("Usage:\n"
-              "    %s [--resize|--update]\n\n"
-              "Possible arguments:\n"
-              "  --help     Print this help\n"
-              "  --update   Trigger the OS Upgrade\n"
-              "  --resize   Run resize2fs on the rootfs partition.\n"
-                                "             After that, performing the OS Upgrade will be impossible.\n\n"
-              "By default, without an argument, the OS Upgrade will be triggered.\n\n", my_name);
+               "    %s [--help|--resize|--update]\n\n"
+               "Possible arguments:\n"
+               "  --help     Print this help\n"
+               "  --update   Trigger the OS Upgrade\n"
+               "  --resize   Run resize2fs on the rootfs partition.\n"
+               "             After that, performing the OS Upgrade will be impossible.\n\n" ,my_name);
 }
 
 static int do_update()
@@ -131,18 +130,19 @@ cleanup:
 
 int main(int argc, char **argv)
 {
-       int ret = 0;
        struct arguments args;
 
        if (parse_args(argc, argv, &args) != 0) {
                return 1;
        }
 
-       if (args.resize) {
-               ret = do_resize();
-       } else if (args.update) {
-               ret = do_update();
-       }
+       if (args.resize)
+               return do_resize();
 
-       return ret;
+       if (args.update)
+               return do_update();
+
+       print_help(argv[0]);
+
+       return 1;
 }