Changeset 8023571 in mainline for uspace/app

Timestamp:

2010-03-21T09:40:37Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c682dd1

Parents:

4e9aaf5 (diff), 19f857a (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 from dev/misc.

Location:

uspace/app

Files:

• bdsh/cmds/builtin_cmds.c (modified) (1 diff)
• bdsh/cmds/builtins/cd/cd.c (modified) (1 diff)
• bdsh/cmds/mod_cmds.c (modified) (1 diff)
• bdsh/cmds/modules/bdd/bdd.c (modified) (1 diff)
• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• bdsh/cmds/modules/help/help.c (modified) (1 diff)
• bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• bdsh/cmds/modules/mkdir/mkdir.c (modified) (1 diff)
• bdsh/cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• bdsh/cmds/modules/rm/rm.c (modified) (1 diff)
• bdsh/cmds/modules/touch/touch.c (modified) (1 diff)
• bdsh/errors.c (modified) (1 diff)
• bdsh/exec.c (modified) (1 diff)
• bdsh/input.c (modified) (1 diff)
• bdsh/scli.c (modified) (1 diff)
• bdsh/util.c (modified) (1 diff)
• edit/sheet.c (modified) (1 diff)
• init/init.c (modified) (1 diff)
• redir/redir.c (modified) (1 diff)
• tester/tester.c (modified) (1 diff)
• tester/vfs/vfs1.c (modified) (1 diff)
• tetris/input.c (modified) (1 diff)
• tetris/scores.c (modified) (1 diff)
• tetris/scores.h (modified) (1 diff)
• tetris/screen.c (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)
• trace/trace.c (modified) (1 diff)

uspace/app/bdsh/cmds/builtin_cmds.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"

uspace/app/bdsh/cmds/builtins/cd/cd.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 

uspace/app/bdsh/cmds/mod_cmds.c

@@ -47 +47 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"

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"

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>
 

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"

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"

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"

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"

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

@@ -38 +38 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 

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"

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"

uspace/app/bdsh/errors.c

@@ -30 +30 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <unistd.h>

uspace/app/bdsh/exec.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 

uspace/app/bdsh/input.c

@@ -32 +32 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>

uspace/app/bdsh/scli.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include "config.h"

uspace/app/bdsh/util.c

@@ -29 +29 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdarg.h>
 #include <stdlib.h>

uspace/app/edit/sheet.c

@@ -50 +50 @@
 
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <adt/list.h>

uspace/app/init/init.c

@@ -46 +46 @@
 #include <malloc.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <devmap.h>
 #include "init.h"

uspace/app/redir/redir.c

@@ -39 +39 @@
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <stdio.h>
 #include <task.h>

uspace/app/tester/tester.c

@@ -38 +38 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include "tester.h"
 

uspace/app/tester/vfs/vfs1.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <vfs/vfs.h>
 #include <unistd.h>

uspace/app/tetris/input.c

@@ -52 +52 @@
 #include <errno.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 
 #include "input.h"

uspace/app/tetris/scores.c

@@ -52 +52 @@
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>

uspace/app/tetris/scores.h

@@ -48 +48 @@
 
 #include <sys/time.h>
-#include <string.h>
+#include <str.h>
 
 #define MAXLOGNAME   16

uspace/app/tetris/screen.c

@@ -49 +49 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <vfs/vfs.h>

uspace/app/tetris/tetris.c

@@ -53 +53 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <getopt.h>

uspace/app/trace/trace.c

@@ -43 +43 @@
 #include <task.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 #include <bool.h>
 #include <loader/loader.h>