Changeset b7be230 in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2009-01-22T17:11:54Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

bffd91f

Parents:

bf226890

Message:

Stop using assert() in modules/builtins as abort() will crash the entire shell.
Handle the case and report the issue, leaving the user able to reproduce it
without rebooting.

File:

• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (2 diffs)

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

@@ -34 +34 @@
 #include <fcntl.h>
 #include <dirent.h>
-#include <assert.h>
 #include <getopt.h>
 
@@ -220 +219 @@
                 len = strlen(argv[i]) + 2;
                 buff = (char *) realloc(buff, len);
-                assert(buff != NULL);
+                if (buff == NULL) {
+                        printf("rm: out of memory\n");
+                        ret = 1;
+                        break;
+                }
                 memset(buff, 0, sizeof(buff));
                 snprintf(buff, len, argv[i]);