Changes in / [eb667613:8ad673a] in mainline
- Files:
-
- 5 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
reb667613 r8ad673a 97 97 $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ 98 98 $(USPACE_PATH)/srv/fs/fat/fat \ 99 $(USPACE_PATH)/srv/fs/pipefs/pipefs \ 99 100 $(USPACE_PATH)/srv/taskmon/taskmon \ 100 101 $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \ -
uspace/Makefile
reb667613 r8ad673a 70 70 srv/fs/tmpfs \ 71 71 srv/fs/devfs \ 72 srv/fs/pipefs \ 72 73 srv/hid/adb_mouse \ 73 74 srv/hid/char_mouse \ -
uspace/app/bdsh/cmds/modules/mount/mount.c
reb667613 r8ad673a 44 44 { 45 45 static char helpfmt[] = 46 "Usage: %s <fstype> <mp> <dev>[<moptions>]\n";46 "Usage: %s <fstype> <mp> [dev] [<moptions>]\n"; 47 47 if (level == HELP_SHORT) { 48 48 printf("'%s' mounts a file system.\n", cmdname); … … 59 59 unsigned int argc; 60 60 const char *mopts = ""; 61 const char *dev = ""; 61 62 int rc; 62 63 63 64 argc = cli_count_args(argv); 64 65 65 if ((argc < 4) || (argc > 5)) {66 if ((argc < 3) || (argc > 5)) { 66 67 printf("%s: invalid number of arguments.\n", 67 68 cmdname); 68 69 return CMD_FAILURE; 69 70 } 71 if (argc > 3) 72 dev = argv[3]; 70 73 if (argc == 5) 71 74 mopts = argv[4]; 72 75 73 rc = mount(argv[1], argv[2], argv[3], mopts, 0);76 rc = mount(argv[1], argv[2], dev, mopts, 0); 74 77 if (rc != EOK) { 75 78 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n", -
uspace/app/redir/redir.c
reb667613 r8ad673a 49 49 static void usage(void) 50 50 { 51 printf("Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",51 fprintf(stderr, "Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n", 52 52 NAME); 53 53 } … … 83 83 args = (const char **) calloc(argc + 1, sizeof(char *)); 84 84 if (!args) { 85 printf("No memory available\n");85 fprintf(stderr, "No memory available\n"); 86 86 return 0; 87 87 } … … 98 98 99 99 if (rc != EOK) { 100 printf("%s: Error spawning %s (%s)\n", NAME, argv[0],100 fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, argv[0], 101 101 str_error(rc)); 102 return 0; 102 103 } 103 104
Note:
See TracChangeset
for help on using the changeset viewer.