Changeset 1433ecda in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2018-04-04T15:42:37Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

File:

• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -175 +175 @@
         while ((dp = readdir(dirp))) {
                 int len = snprintf(buff, PATH_MAX - 1, "%s/%s", path, dp->d_name);
-                if (len > PATH_MAX-1) {
+                if (len > PATH_MAX - 1) {
                         // TODO: Do not enforce arbitrary static limits.
                         cli_error(CL_EFAIL, "Path too long for %s/%s", path, dp->d_name);
@@ -229 +229 @@
                 help_cmd_rm(HELP_SHORT);
                 printf(
-                "Usage:  %s [options] <path>\n"
-                "Options:\n"
-                "  -h, --help       A short option summary\n"
-                "  -v, --version    Print version information and exit\n"
-                "  -r, --recursive  Recursively remove sub directories\n"
-                "  -f, --force      Do not prompt prior to removing files\n"
-                "  -s, --safe       Stop if directories change during removal\n\n"
-                "Currently, %s is under development, some options don't work.\n",
-                cmdname, cmdname);
+                    "Usage:  %s [options] <path>\n"
+                    "Options:\n"
+                    "  -h, --help       A short option summary\n"
+                    "  -v, --version    Print version information and exit\n"
+                    "  -r, --recursive  Recursively remove sub directories\n"
+                    "  -f, --force      Do not prompt prior to removing files\n"
+                    "  -s, --safe       Stop if directories change during removal\n\n"
+                    "Currently, %s is under development, some options don't work.\n",
+                    cmdname, cmdname);
         }
         return;
@@ -255 +255 @@
         if (argc < 2) {
                 cli_error(CL_EFAIL,
-                        "%s: insufficient arguments. Try %s --help", cmdname, cmdname);
+                    "%s: insufficient arguments. Try %s --help", cmdname, cmdname);
                 return CMD_FAILURE;
         }
@@ -293 +293 @@
         if ((unsigned) optind == argc) {
                 cli_error(CL_EFAIL,
-                        "%s: insufficient arguments. Try %s --help", cmdname, cmdname);
+                    "%s: insufficient arguments. Try %s --help", cmdname, cmdname);
                 rm_end(&rm);
                 return CMD_FAILURE;
@@ -317 +317 @@
                         break;
                 case RM_DIR:
-                        if (! rm.recursive) {
+                        if (!rm.recursive) {
                                 printf("%s is a directory, use -r to remove it.\n", buff);
-                                ret ++;
+                                ret++;
                         } else {
                                 ret += rm_recursive(buff);