Changeset 12d7710 in mainline for uspace/app
- Timestamp:
- 2010-03-26T22:01:28Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1faa995
- Parents:
- 4204ad9 (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. - Location:
- uspace/app
- Files:
-
- 1 deleted
- 39 edited
-
Makefile.common (deleted)
-
bdsh/Makefile (modified) (2 diffs)
-
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/Makefile (modified) (2 diffs)
-
edit/sheet.c (modified) (1 diff)
-
getterm/Makefile (modified) (2 diffs)
-
init/Makefile (modified) (1 diff)
-
init/init.c (modified) (1 diff)
-
klog/Makefile (modified) (1 diff)
-
mkfat/Makefile (modified) (1 diff)
-
redir/Makefile (modified) (1 diff)
-
redir/redir.c (modified) (1 diff)
-
taskdump/Makefile (modified) (2 diffs)
-
tester/Makefile (modified) (2 diffs)
-
tester/tester.c (modified) (1 diff)
-
tester/vfs/vfs1.c (modified) (1 diff)
-
tetris/Makefile (modified) (2 diffs)
-
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/Makefile (modified) (2 diffs)
-
trace/trace.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/bdsh/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a 32 32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules 33 34 OUTPUT = bdsh 33 BINARY = bdsh 35 34 36 35 SOURCES = \ … … 60 59 scli.c 61 60 62 include ../Makefile.common61 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/bdsh/cmds/builtin_cmds.c
r4204ad9 r12d7710 34 34 #include <stdio.h> 35 35 #include <stdlib.h> 36 #include <str ing.h>36 #include <str.h> 37 37 #include "errors.h" 38 38 #include "cmds.h" -
uspace/app/bdsh/cmds/builtins/cd/cd.c
r4204ad9 r12d7710 32 32 #include <stdlib.h> 33 33 #include <unistd.h> 34 #include <str ing.h>34 #include <str.h> 35 35 #include <errno.h> 36 36 -
uspace/app/bdsh/cmds/mod_cmds.c
r4204ad9 r12d7710 47 47 #include <stdio.h> 48 48 #include <stdlib.h> 49 #include <str ing.h>49 #include <str.h> 50 50 #include "errors.h" 51 51 #include "cmds.h" -
uspace/app/bdsh/cmds/modules/bdd/bdd.c
r4204ad9 r12d7710 29 29 #include <stdio.h> 30 30 #include <stdlib.h> 31 #include <str ing.h>31 #include <str.h> 32 32 #include "config.h" 33 33 #include "util.h" -
uspace/app/bdsh/cmds/modules/cat/cat.c
r4204ad9 r12d7710 33 33 #include <unistd.h> 34 34 #include <getopt.h> 35 #include <str ing.h>35 #include <str.h> 36 36 #include <fcntl.h> 37 37 -
uspace/app/bdsh/cmds/modules/cp/cp.c
r4204ad9 r12d7710 33 33 #include <unistd.h> 34 34 #include <getopt.h> 35 #include <str ing.h>35 #include <str.h> 36 36 #include <fcntl.h> 37 37 #include "config.h" -
uspace/app/bdsh/cmds/modules/help/help.c
r4204ad9 r12d7710 31 31 #include <stdio.h> 32 32 #include <stdlib.h> 33 #include <str ing.h>33 #include <str.h> 34 34 35 35 #include "config.h" -
uspace/app/bdsh/cmds/modules/ls/ls.c
r4204ad9 r12d7710 40 40 #include <sys/types.h> 41 41 #include <sys/stat.h> 42 #include <str ing.h>42 #include <str.h> 43 43 44 44 #include "errors.h" -
uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
r4204ad9 r12d7710 38 38 #include <getopt.h> 39 39 #include <stdarg.h> 40 #include <str ing.h>40 #include <str.h> 41 41 42 42 #include "config.h" -
uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
r4204ad9 r12d7710 38 38 #include <getopt.h> 39 39 #include <stdarg.h> 40 #include <str ing.h>40 #include <str.h> 41 41 #include <ctype.h> 42 42 -
uspace/app/bdsh/cmds/modules/rm/rm.c
r4204ad9 r12d7710 36 36 #include <getopt.h> 37 37 #include <mem.h> 38 #include <str ing.h>38 #include <str.h> 39 39 40 40 #include "config.h" -
uspace/app/bdsh/cmds/modules/touch/touch.c
r4204ad9 r12d7710 38 38 #include <dirent.h> 39 39 #include <sys/types.h> 40 #include <str ing.h>40 #include <str.h> 41 41 42 42 #include "config.h" -
uspace/app/bdsh/errors.c
r4204ad9 r12d7710 30 30 31 31 #include <stdio.h> 32 #include <str ing.h>32 #include <str.h> 33 33 #include <stdlib.h> 34 34 #include <unistd.h> -
uspace/app/bdsh/exec.c
r4204ad9 r12d7710 38 38 #include <stdlib.h> 39 39 #include <unistd.h> 40 #include <str ing.h>40 #include <str.h> 41 41 #include <fcntl.h> 42 42 -
uspace/app/bdsh/input.c
r4204ad9 r12d7710 32 32 #include <stdio.h> 33 33 #include <stdlib.h> 34 #include <str ing.h>34 #include <str.h> 35 35 #include <io/console.h> 36 36 #include <io/keycode.h> -
uspace/app/bdsh/scli.c
r4204ad9 r12d7710 31 31 #include <stdio.h> 32 32 #include <stdlib.h> 33 #include <str ing.h>33 #include <str.h> 34 34 #include <unistd.h> 35 35 #include "config.h" -
uspace/app/bdsh/util.c
r4204ad9 r12d7710 29 29 30 30 #include <stdio.h> 31 #include <str ing.h>31 #include <str.h> 32 32 #include <stdarg.h> 33 33 #include <stdlib.h> -
uspace/app/edit/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = edit 31 BINARY = edit 34 32 35 33 SOURCES = \ … … 37 35 sheet.c 38 36 39 include ../Makefile.common37 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/edit/sheet.c
r4204ad9 r12d7710 50 50 51 51 #include <stdlib.h> 52 #include <str ing.h>52 #include <str.h> 53 53 #include <errno.h> 54 54 #include <adt/list.h> -
uspace/app/getterm/Makefile
r4204ad9 r12d7710 28 28 # 29 29 30 include ../../../version31 DEFS += -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"32 33 30 USPACE_PREFIX = ../.. 34 LIBS = $(LIBC_PREFIX)/libc.a 35 36 OUTPUT = getterm 31 DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" 32 BINARY = getterm 37 33 38 34 SOURCES = \ … … 40 36 version.c 41 37 42 include ../Makefile.common38 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/init/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = init 31 BINARY = init 34 32 35 33 SOURCES = \ 36 34 init.c 37 35 38 include ../Makefile.common36 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/init/init.c
r4204ad9 r12d7710 46 46 #include <malloc.h> 47 47 #include <macros.h> 48 #include <str ing.h>48 #include <str.h> 49 49 #include <devmap.h> 50 50 #include "init.h" -
uspace/app/klog/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = klog 31 BINARY = klog 34 32 35 33 SOURCES = \ 36 34 klog.c 37 35 38 include ../Makefile.common36 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/mkfat/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a 32 32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) 33 34 OUTPUT = mkfat 33 BINARY = mkfat 35 34 36 35 SOURCES = \ 37 36 mkfat.c 38 37 39 include ../Makefile.common38 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/redir/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = redir 31 BINARY = redir 34 32 35 33 SOURCES = \ 36 34 redir.c 37 35 38 include ../Makefile.common36 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/redir/redir.c
r4204ad9 r12d7710 39 39 #include <fcntl.h> 40 40 #include <unistd.h> 41 #include <str ing.h>41 #include <str.h> 42 42 #include <stdio.h> 43 43 #include <task.h> -
uspace/app/taskdump/Makefile
r4204ad9 r12d7710 28 28 29 29 USPACE_PREFIX = ../.. 30 LIBS = $(LIBC_PREFIX)/libc.a31 30 EXTRA_CFLAGS = -Iinclude 32 33 OUTPUT = taskdump 31 BINARY = taskdump 34 32 35 33 SOURCES = \ … … 38 36 symtab.c 39 37 40 include ../Makefile.common38 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/tester/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = tester 31 BINARY = tester 34 32 35 33 SOURCES = \ … … 53 51 mm/malloc1.c 54 52 55 include ../Makefile.common53 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/tester/tester.c
r4204ad9 r12d7710 38 38 #include <unistd.h> 39 39 #include <stdio.h> 40 #include <str ing.h>40 #include <str.h> 41 41 #include "tester.h" 42 42 -
uspace/app/tester/vfs/vfs1.c
r4204ad9 r12d7710 30 30 #include <stdio.h> 31 31 #include <stdlib.h> 32 #include <str ing.h>32 #include <str.h> 33 33 #include <vfs/vfs.h> 34 34 #include <unistd.h> -
uspace/app/tetris/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = tetris 31 BINARY = tetris 34 32 35 33 SOURCES = \ … … 40 38 screen.c 41 39 42 include ../Makefile.common40 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/tetris/input.c
r4204ad9 r12d7710 52 52 #include <errno.h> 53 53 #include <unistd.h> 54 #include <str ing.h>54 #include <str.h> 55 55 56 56 #include "input.h" -
uspace/app/tetris/scores.c
r4204ad9 r12d7710 52 52 #include <errno.h> 53 53 #include <stdio.h> 54 #include <str ing.h>54 #include <str.h> 55 55 #include <io/console.h> 56 56 #include <io/keycode.h> -
uspace/app/tetris/scores.h
r4204ad9 r12d7710 48 48 49 49 #include <sys/time.h> 50 #include <str ing.h>50 #include <str.h> 51 51 52 52 #define MAXLOGNAME 16 -
uspace/app/tetris/screen.c
r4204ad9 r12d7710 49 49 #include <stdio.h> 50 50 #include <stdlib.h> 51 #include <str ing.h>51 #include <str.h> 52 52 #include <unistd.h> 53 53 #include <vfs/vfs.h> -
uspace/app/tetris/tetris.c
r4204ad9 r12d7710 53 53 #include <stdio.h> 54 54 #include <stdlib.h> 55 #include <str ing.h>55 #include <str.h> 56 56 #include <unistd.h> 57 57 #include <getopt.h> -
uspace/app/trace/Makefile
r4204ad9 r12d7710 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBC_PREFIX)/libc.a 32 33 OUTPUT = trace 31 BINARY = trace 34 32 35 33 SOURCES = \ … … 41 39 errors.c 42 40 43 include ../Makefile.common41 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/trace/trace.c
r4204ad9 r12d7710 43 43 #include <task.h> 44 44 #include <mem.h> 45 #include <str ing.h>45 #include <str.h> 46 46 #include <bool.h> 47 47 #include <loader/loader.h>
Note:
See TracChangeset
for help on using the changeset viewer.
