Changeset f4b1535 in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2009-04-09T23:04:10Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6eb2e96

Parents:

095003a8

Message:

str_ncpy() vs str_cpy(). TODO: The same in userspace.

File:

• kernel/generic/src/console/kconsole.c (modified) (5 diffs)

kernel/generic/src/console/kconsole.c

@@ -215 +215 @@
         while ((hint = cmdtab_search_one(name, &pos))) {
                 if ((found == 0) || (str_length(output) > str_length(hint)))
-                        str_ncpy(output, hint, MAX_CMDLINE);
+                        str_cpy(output, MAX_CMDLINE, hint);
                 
                 pos = pos->next;
@@ -232 +232 @@
         
         if (found > 0)
-                str_ncpy(input, output, size);
+                str_cpy(input, size, output);
         
         return found;
@@ -439 +439 @@
         if ((text[0] < '0') || (text[0] > '9')) {
                 char symname[MAX_SYMBOL_NAME];
-                str_ncpy(symname, text, min(len + 1, MAX_SYMBOL_NAME));
+                str_ncpy(symname, MAX_SYMBOL_NAME, text, len + 1);
                 
                 uintptr_t symaddr;
@@ -581 +581 @@
                 case ARG_TYPE_STRING:
                         buf = (char *) cmd->argv[i].buffer;
-                        str_ncpy(buf, cmdline + start,
-                            min((end - start) + 1, cmd->argv[i].len));
+                        str_ncpy(buf, cmd->argv[i].len, cmdline + start,
+                            (end - start) + 1);
                         break;
                 case ARG_TYPE_INT:
@@ -593 +593 @@
                                 if (cmdline[end - 1] == '"') {
                                         buf = (char *) cmd->argv[i].buffer;
-                                        str_ncpy(buf, cmdline + start + 1,
-                                            min((end - start) - 1, cmd->argv[i].len));
+                                        str_ncpy(buf, cmd->argv[i].len,
+                                            cmdline + start + 1,
+                                            (end - start) - 1);
                                         cmd->argv[i].intval = (unative_t) buf;
                                         cmd->argv[i].vartype = ARG_TYPE_STRING;