Changeset 583:093d1f9455b5

Timestamp:

06/05/08 17:12:48 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Branch:

default

Message:

Fix the RCMD find command bug.

Location:

nxos/base/lib/rcmd

Files:

• _rcmd.c (modified) (3 diffs)
• _rcmd.h (modified) (2 diffs)
• rcmd.c (modified) (4 diffs)
• rcmd.h (modified) (1 diff)

nxos/base/lib/rcmd/_rcmd.c

@@ -1 @@
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007-2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -36 +36 @@
 };
 
-rcmd_err_t nx__rcmd_find_command(const char *line, rcmd_command_def *command) {
+rcmd_err_t nx__rcmd_find_command(char *line, rcmd_command_def *command) {
   U32 i = 0;
+  char *sep;
+
+  sep = strchr(line, RCMD_TOKEN_SEPARATOR);
+  if (sep) {
+    *sep = '\0';
+  }
 
   while (rcmd_commands[i].name) {
     if (streq(line, rcmd_commands[i].name)) {
       *command = rcmd_commands[i];
+      *sep = RCMD_TOKEN_SEPARATOR;
       return RCMD_ERR_NO_ERROR;
     }
@@ -48 +55 @@
   }
 
+  *sep = RCMD_TOKEN_SEPARATOR;
   return RCMD_ERR_COMMAND_NOT_FOUND;
 }

nxos/base/lib/rcmd/_rcmd.h

@@ -3 +3 @@
  */
 
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007-2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -40 +40 @@
  * @return An appropriate @a rcmd_err_t error code.
  */
-rcmd_err_t nx__rcmd_find_command(const char *line, rcmd_command_def *command);
+rcmd_err_t nx__rcmd_find_command(char *line, rcmd_command_def *command);
 
 rcmd_err_t nx__rcmd_move(char *line);

nxos/base/lib/rcmd/rcmd.c

@@ -1 @@
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007-2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -11 +11 @@
 #include "base/assert.h"
 #include "base/fs.h"
+#include "base/display.h"
 #include "base/lib/rcmd/rcmd.h"
 #include "base/lib/rcmd/_rcmd.h"
@@ -23 +24 @@
   }
 
-  err = nx__rcmd_find_command(line, &command);
+  /* Call the command actuator on a copy of the command line so
+   * it can mess around with it if it wants to.
+   */
+  memcpy(cmdline, line, strlen(line));
+
+  err = nx__rcmd_find_command(cmdline, &command);
   if (err != RCMD_ERR_NO_ERROR) {
     return err;
   }
 
-  /* Call the command actuator on a copy of the command line so
-   * it can mess around with it if it wants to.
-   */
-  memcpy(cmdline, line, strlen(line));
   return command.actuator(cmdline);
 }
@@ -37 +39 @@
 void nx_rcmd_parse(char *file) {
   rcmd_err_t err, result;
+  fs_err_t fserr;
   fs_fd_t fd;
   int n = 0;
 
-  if (nx_fs_open(file, FS_FILE_MODE_OPEN, &fd) != FS_ERR_NO_ERROR) {
+  fserr = nx_fs_open(file, FS_FILE_MODE_OPEN, &fd);
+  if (fserr != FS_ERR_NO_ERROR) {
+    nx_display_uint(fserr);
+    nx_display_end_line();
     nx__rcmd_error(RCMD_ERR_READ_ERROR, file, 0);
     return;

nxos/base/lib/rcmd/rcmd.h

@@ -3 +3 @@
  */
 
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007-2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.