Changes in / [0b37882:cf2af94] in mainline

Files:

• .bzrignore (added)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/Makefile.common (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/mount/mount.c (modified) (2 diffs)
• uspace/app/redir/redir.c (modified) (3 diffs)
• uspace/lib/ext2/Makefile (added)
• uspace/lib/ext2/libext2.c (added)
• uspace/lib/ext2/libext2.h (added)
• uspace/srv/fs/ext2/Makefile (added)
• uspace/srv/fs/ext2/ext2.c (added)
• uspace/srv/fs/ext2/ext2.h (added)
• uspace/srv/fs/ext2/ext2_ops.c (added)
• uspace/srv/fs/pipefs/Makefile (added)
• uspace/srv/fs/pipefs/pipefs.c (added)
• uspace/srv/fs/pipefs/pipefs.h (added)
• uspace/srv/fs/pipefs/pipefs_ops.c (added)
• uspace/srv/hw/netif/ne2000/dp8390_drv.h (added)
• uspace/srv/hw/netif/ne2000/dp8390_port.h (added)
• uspace/srv/hw/netif/ne2000/local.h (added)
• uspace/srv/hw/netif/ne2000/ne2000.h (added)

boot/Makefile.common

@@ -97 +97 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/pipefs/pipefs \
+        $(USPACE_PATH)/srv/fs/ext2/ext2 \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \

uspace/Makefile

@@ -72 +72 @@
         srv/fs/tmpfs \
         srv/fs/devfs \
+        srv/fs/pipefs \
+        srv/fs/ext2 \
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
@@ -148 +150 @@
         lib/drv \
         lib/packet \
-        lib/net
+        lib/net \
+        lib/ext2
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))

uspace/Makefile.common

@@ -86 +86 @@
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 
+LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
+
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet

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

@@ -44 +44 @@
 {
         static char helpfmt[] =
-            "Usage:  %s <fstype> <mp> <dev> [<moptions>]\n";
+            "Usage:  %s <fstype> <mp> [dev] [<moptions>]\n";
         if (level == HELP_SHORT) {
                 printf("'%s' mounts a file system.\n", cmdname);
@@ -59 +59 @@
         unsigned int argc;
         const char *mopts = "";
+        const char *dev = "";
         int rc;
 
         argc = cli_count_args(argv);
 
-        if ((argc < 4) || (argc > 5)) {
+        if ((argc < 3) || (argc > 5)) {
                 printf("%s: invalid number of arguments.\n",
                     cmdname);
                 return CMD_FAILURE;
         }
+        if (argc > 3)
+                dev = argv[3];
         if (argc == 5)
                 mopts = argv[4];
 
-        rc = mount(argv[1], argv[2], argv[3], mopts, 0);
+        rc = mount(argv[1], argv[2], dev, mopts, 0);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",

uspace/app/redir/redir.c

@@ -49 +49 @@
 static void usage(void)
 {
-        printf("Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
+        fprintf(stderr, "Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
             NAME);
 }
@@ -83 +83 @@
         args = (const char **) calloc(argc + 1, sizeof(char *));
         if (!args) {
-                printf("No memory available\n");
+                fprintf(stderr, "No memory available\n");
                 return 0;
         }
@@ -98 +98 @@
         
         if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", NAME, argv[0],
+                fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, argv[0],
                     str_error(rc));
+                return 0;
         }