Changeset a35b458 in mainline for uspace/app/bdsh/input.c

Timestamp:

2018-03-02T20:10:49Z (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:

f1380b7

Parents:

3061bc1

git-author:

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

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/app/bdsh/input.c (modified) (16 diffs)

uspace/app/bdsh/input.c

@@ -71 +71 @@
                 return ENOMEM;
         token_t *tokens = tokens_buf;
-        
+
         char *cmd[WORD_MAX];
         errno_t rc = EOK;
@@ -89 +89 @@
                 goto finit;
         }
-        
+
         size_t tokens_length;
         rc = tok_tokenize(&tok, &tokens_length);
@@ -95 +95 @@
                 goto finit;
         }
-        
+
         if (tokens_length > 0 && tokens[0].type == TOKTYPE_SPACE) {
                 tokens++;
                 tokens_length--;
         }
-        
+
         if (tokens_length > 0 && tokens[tokens_length-1].type == TOKTYPE_SPACE) {
                 tokens_length--;
         }
-        
+
         /* Until full support for pipes is implemented, allow for a simple case:
          * [from <file> |] command [| to <file>]
@@ -121 +121 @@
                 }
         }
-        
+
         unsigned int cmd_token_start = 0;
         unsigned int cmd_token_end = tokens_length;
-        
+
         processed_pipes = 0;
-        
+
         /* Check if the first part (from <file> |) is present */
         if (pipe_count > 0 && (pipe_pos[0] == 3 || pipe_pos[0] == 4) && str_cmp(tokens[0].text, "from") == 0) {
@@ -134 +134 @@
                 processed_pipes++;
         }
-        
+
         /* Check if the second part (| to <file>) is present */
         if ((pipe_count - processed_pipes) > 0 &&
@@ -146 +146 @@
                 processed_pipes++;
         }
-        
+
         if (processed_pipes != pipe_count) {
                 print_pipe_usage();
@@ -152 +152 @@
                 goto finit;
         }
-        
+
         /* Convert tokens of the command to string array */
         unsigned int cmd_pos = 0;
@@ -161 +161 @@
         }
         cmd[cmd_pos++] = NULL;
-        
+
         if (cmd[0] == NULL) {
                 print_pipe_usage();
@@ -167 +167 @@
                 goto finit;
         }
-        
+
         iostate_t new_iostate = {
                 .stdin = stdin,
@@ -173 +173 @@
                 .stderr = stderr
         };
-        
+
         FILE *from = NULL;
         FILE *to = NULL;
-        
+
         if (redir_from) {
                 from = fopen(redir_from, "r");
@@ -186 +186 @@
                 new_iostate.stdin = from;
         }
-        
-        
+
+
         if (redir_to) {
                 to = fopen(redir_to, "w");
@@ -203 +203 @@
                 rc = EINVAL;
         }
-        
+
 finit_with_files:
         if (from != NULL) {
@@ -211 +211 @@
                 fclose(to);
         }
-        
+
 finit:
         if (NULL != usr->line) {
@@ -230 +230 @@
         printf("from filename | command ... | to filename\n");
         printf("command ... | to filename\n");
-        
+
 }
 
@@ -236 +236 @@
 {
         int id = 0;
-        
+
         /* We have rubbish */
         if (NULL == cmd[0]) {
                 return CL_ENOENT;
         }
-        
+
         /* Is it a builtin command ? */
         if ((id = (is_builtin(cmd[0]))) > -1) {
                 return run_builtin(id, cmd, usr, new_iostate);
         }
-        
+
         /* Is it a module ? */
         if ((id = (is_module(cmd[0]))) > -1) {
@@ -260 +260 @@
         char *str;
         errno_t rc;
-        
+
         tinput_set_prompt(tinput, usr->prompt);