Changeset 1b20da0 in mainline for uspace/app/bdsh

Timestamp:

2018-02-28T17:52:03Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

3061bc1

Parents:

df6ded8

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:26:03)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:52:03)

Message:

style: Remove trailing whitespace on non-empty lines, in certain file types.

Command used: tools/srepl '\([^[:space:]]\)\s\+$' '\1' -- *.c *.h *.py *.sh *.s *.S *.ag

Location:

uspace/app/bdsh

Files:

• cmds/modules/cp/cp.c (modified) (3 diffs)
• cmds/modules/ls/ls.c (modified) (5 diffs)
• cmds/modules/printf/printf.c (modified) (7 diffs)
• cmds/modules/sleep/sleep.c (modified) (1 diff)
• input.c (modified) (1 diff)
• tok.c (modified) (2 diffs)

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

@@ -231 +231 @@
                         /* e.g. cp file_name existing_file */
 
-                        /* dest already exists, 
+                        /* dest already exists,
                          * if force is set we will try to remove it.
                          * if interactive is set user input is required.
@@ -414 +414 @@
                 vfs_put(fd1);
                 vfs_put(fd2);
-                return -1;      
+                return -1;
         }
 
@@ -486 +486 @@
         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind);
-                switch (c) { 
+                switch (c) {
                 case 'h':
                         help_cmd_cp(1);

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

@@ -129 +129 @@
  *                              0 otherwise.
  */
-static signed int ls_scan_dir(const char *d, DIR *dirp, 
+static signed int ls_scan_dir(const char *d, DIR *dirp,
     struct dir_elem_t **dir_list_ptr)
 {
@@ -198 +198 @@
         /* Populate the directory list. */
         if (ls.recursive) {
-                tmp = (struct dir_elem_t *) realloc(*dir_list_ptr, 
+                tmp = (struct dir_elem_t *) realloc(*dir_list_ptr,
                     nbdirs * sizeof(struct dir_elem_t));
                 if (!tmp) {
                         cli_error(CL_ENOMEM, "ls: failed to scan %s", d);
                         goto out;
-                } 
+                }
                 *dir_list_ptr = tmp;
 
@@ -253 +253 @@
         }
 
-        nbdirs = ls_scan_dir(path, dirp, &dir_list); 
+        nbdirs = ls_scan_dir(path, dirp, &dir_list);
         if (nbdirs == -1) {
                 ret = CMD_FAILURE;
@@ -292 +292 @@
                         ret = CMD_FAILURE;
                         goto out;
-                }       
+                }
         }
    
-        ret = CMD_SUCCESS; 
+        ret = CMD_SUCCESS;
 
 out:
@@ -405 +405 @@
                 if (ls.recursive)
                         ret = ls_recursive(de.name, dirp);
-                else  
+                else
                         ret = ls_scan_dir(de.name, dirp, NULL);
 

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

@@ -60 +60 @@
 
 /** Print a formatted data with lib printf.
- * 
+ *
  * Currently available format flags are:
  * '%d' - integer.
  * '%u' - unsigned integer.
  * '%s' - null-terminated string.
- ***** 
+ *****
  * @param ch  formatted flag.
  * @param arg string with data to print.
@@ -88 +88 @@
 
 /** Process a control character.
- * 
+ *
  * Currently available characters are:
  * '\n' - new line.
- ***** 
+ *****
  * @param ch  Control character.
  */
@@ -107 +107 @@
 
 
-/** Prints formatted data. 
+/** Prints formatted data.
  *
  * Accepted format flags:
@@ -143 +143 @@
 
                 case '\\':
-                        if (esc_flag) 
+                        if (esc_flag)
                                 goto emit;
                         esc_flag = true;
@@ -149 +149 @@
 
                 case '%':
-                        if (esc_flag) 
+                        if (esc_flag)
                                 goto emit;
                         ch = str_decode(fmt, &pos, fmt_sz);
-                        if (!ch) { 
+                        if (!ch) {
                                 putchar('%');
                                 break;
@@ -170 +170 @@
                                 break;
                         }
-                        putchar(ch);    
+                        putchar(ch);
                         break;
 
@@ -177 +177 @@
                         esc_flag = false;
                 }
-        }       
+        }
 
         return CMD_SUCCESS;

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

@@ -92 +92 @@
 
                 int ndigits = endptr - nptr;
-                for (; ndigits < 6; ndigits++) 
+                for (; ndigits < 6; ndigits++)
                         frac_seconds *= 10;
                 for (; ndigits > 6; ndigits--)

uspace/app/bdsh/input.c

@@ -107 +107 @@
         /* Until full support for pipes is implemented, allow for a simple case:
          * [from <file> |] command [| to <file>]
-         * 
+         *
          * First find the pipes and check that there are no more
          */

uspace/app/bdsh/tok.c

@@ -45 +45 @@
 
 /** Initialize the token parser
- * 
+ *
  * @param tok the tokenizer structure to initialize
  * @param input the input string to tokenize
@@ -53 +53 @@
 errno_t tok_init(tokenizer_t *tok, char *input, token_t *out_tokens,
     size_t max_tokens)
-{       
+{
         tok->in = input;
         tok->in_offset = 0;