Changeset 8e81a7e in mainline

Timestamp:

2012-04-01T17:45:39Z (12 years ago)

Author:

Prutkov Alex <prutkov.alex@…>

Branches:

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

Children:

087c27f6

Parents:

1ffd74e

Message:

Added TODO for printf, some comments, fixed BDSH TODO list

Location:

uspace/app/bdsh

Files:

• TODO (modified) (1 diff)
• cmds/modules/printf/TODO (added)
• cmds/modules/printf/printf.c (modified) (5 diffs)

uspace/app/bdsh/TODO

@@ -30 +30 @@
 * Add wrappers for signal, sigaction to make ports to modules easier
 
-* Add 'echo' and 'printf' modules.
-
 Regarding POSIX:
 ----------------

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

@@ -59 +59 @@
 
 
-static void print_arg(wchar_t ch, const char* arg)
+static int print_arg(wchar_t ch, const char* arg)
 {
         switch(ch) {
@@ -72 +72 @@
                 break;
         default:
-                return;
+                return CMD_FAILURE;
         }
+        return CMD_SUCCESS;
 }
 
-static void process_esc(wchar_t ch)
+static int process_esc(wchar_t ch)
 {
         switch(ch) {
@@ -83 +84 @@
                 break;
         default:
-                return;
+                return CMD_FAILURE;
         }
+        return CMD_SUCCESS;
 }
 
 
-/* Main entry point for printf, accepts an array of arguments */
+/* Prints formatted data. 
+ * Accepted format flags:
+ * %d - print an integer
+ * %u - print an unsigned integer
+ * %s - print a null terminated string
+ *****
+ * Accepted output controls:
+ * \n - new line
+ */
 int cmd_printf(char **argv)
 {
@@ -96 +106 @@
         wchar_t ch;
         bool esc_flag = false;
-        unsigned int carg;
+        unsigned int carg;     // Current argument
 
         /* Count the arguments */
@@ -128 +138 @@
                                 break;
                         }
+                        if (carg == argc) {
+                                printf("\nBad parameter number. Aborted.\n");
+                                return CMD_FAILURE;
+                        }
                         print_arg(ch, argv[carg]);
                         ++carg;