Changeset 371bd7d in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/app/bdsh/cmds/modules

Files:

• bdd/bdd.c (modified) (2 diffs)
• cat/cat.c (modified) (3 diffs)
• cp/cp.c (modified) (2 diffs)
• help/help.c (modified) (2 diffs)
• kcon/kcon.c (modified) (1 diff)
• ls/ls.c (modified) (3 diffs)
• mkdir/mkdir.c (modified) (2 diffs)
• mkfile/entry.h (added)
• mkfile/mkfile.c (added)
• mkfile/mkfile.h (added)
• mkfile/mkfile_def.h (added)
• module_aliases.h (modified) (1 diff)
• modules.h (modified) (4 diffs)
• mount/mount.c (modified) (1 diff)
• pwd/pwd.c (modified) (1 diff)
• rm/rm.c (modified) (2 diffs)
• sleep/sleep.c (modified) (1 diff)
• touch/touch.c (modified) (2 diffs)
• unmount/entry.h (added)
• unmount/unmount.c (added)
• unmount/unmount.h (added)
• unmount/unmount_def.h (added)

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

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
@@ -73 +73 @@
         size_t block_size;
         int rc;
-        bn_t ba;
+        aoff64_t ba;
         uint8_t b;
 

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

@@ -33 +33 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
@@ -43 +43 @@
 #include "cmds.h"
 
-static char *cmdname = "cat";
+static const char *cmdname = "cat";
 #define CAT_VERSION "0.0.1"
 #define CAT_DEFAULT_BUFLEN 1024
 
-static char *cat_oops = "That option is not yet supported\n";
+static const char *cat_oops = "That option is not yet supported\n";
 
 static struct option const long_options[] = {
@@ -85 +85 @@
 {
         int fd, bytes = 0, count = 0, reads = 0;
-        off_t total = 0;
+        off64_t total = 0;
         char *buff = NULL;
 

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

@@ -33 +33 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 #include "config.h"
@@ -74 +74 @@
 {
         int fd1, fd2, bytes = 0;
-        off_t total = 0;
+        off64_t total = 0;
         int64_t copied = 0;
         char *buff = NULL;

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

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
@@ -42 +42 @@
 #include "util.h"
 
-static char *cmdname = "help";
+static const char *cmdname = "help";
 extern const char *progname;
 

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

@@ -40 +40 @@
 #include "cmds.h"
 
-static char *cmdname = "kcon";
+static const char *cmdname = "kcon";
 
 /* Dispays help for kcon in various levels */

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

@@ -40 +40 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <str.h>
 
 #include "errors.h"
@@ -49 +49 @@
 #include "cmds.h"
 
-static char *cmdname = "ls";
+static const char *cmdname = "ls";
 
 static void ls_scan_dir(const char *d, DIR *dirp)
@@ -100 +100 @@
         if (s.is_file)
                 printf("%-40s\t%llu\n", name, (long long) s.size);
+        else if (s.is_directory)
+                printf("%-40s\t<dir>\n", name);
         else
                 printf("%-40s\n", name);

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

@@ -38 +38 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
@@ -49 +49 @@
 #define MKDIR_VERSION "0.0.1"
 
-static char *cmdname = "mkdir";
+static const char *cmdname = "mkdir";
 
 static struct option const long_options[] = {

uspace/app/bdsh/cmds/modules/module_aliases.h

@@ -12 +12 @@
  * the entry point being reached. */
 
-char *mod_aliases[] = {
+const char *mod_aliases[] = {
         "ren", "mv",
+        "umount", "unmount",
         NULL, NULL
 };

uspace/app/bdsh/cmds/modules/modules.h

@@ -20 +20 @@
 #include "help/entry.h"
 #include "mkdir/entry.h"
+#include "mkfile/entry.h"
 #include "rm/entry.h"
 #include "bdd/entry.h"
@@ -30 +31 @@
 #include "mv/entry.h"
 #include "mount/entry.h"
+#include "unmount/entry.h"
 #include "kcon/entry.h"
 
@@ -39 +41 @@
 #include "help/help_def.h"
 #include "mkdir/mkdir_def.h"
+#include "mkfile/mkfile_def.h"
 #include "rm/rm_def.h"
 #include "bdd/bdd_def.h"
@@ -49 +52 @@
 #include "mv/mv_def.h"
 #include "mount/mount_def.h"
+#include "unmount/unmount_def.h"
 #include "kcon/kcon_def.h"
 

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

@@ -58 +58 @@
 {
         unsigned int argc;
-        char *mopts = "";
+        const char *mopts = "";
         int rc;
 

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

@@ -39 +39 @@
 #include "pwd.h"
 
-static char * cmdname = "pwd";
+static const char *cmdname = "pwd";
 
 void help_cmd_pwd(unsigned int level)

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

@@ -36 +36 @@
 #include <getopt.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
@@ -45 +45 @@
 #include "cmds.h"
 
-static char *cmdname = "rm";
+static const char *cmdname = "rm";
 #define RM_VERSION "0.0.1"
 

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

@@ -38 +38 @@
 #include "cmds.h"
 
-static char *cmdname = "sleep";
+static const char *cmdname = "sleep";
 
 /* Dispays help for sleep in various levels */

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

@@ -38 +38 @@
 #include <dirent.h>
 #include <sys/types.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
@@ -47 +47 @@
 #include "cmds.h"
 
-static char *cmdname = "touch";
+static const char *cmdname = "touch";
 
 /* Dispays help for touch in various levels */