Follow-up changes to make the fs_shell instances build after adding the scripting extension.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11542 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
87580cd7ab
commit
ce13a6d573
@ -24,9 +24,13 @@ UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp
|
||||
SubDirC++Flags $(defines) -fno-exceptions -fno-rtti $(malloc_debug_flags) -include [ FDirName $(SUBDIR) Debug.h ] ;
|
||||
}
|
||||
|
||||
local fsShellSources =
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
|
||||
stub.c tracker.cpp sysdep.c hexdump.c argv.c
|
||||
;
|
||||
|
||||
SimpleTest bfs_shell :
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c tracker.cpp
|
||||
sysdep.c hexdump.c argv.c
|
||||
$(fsShellSources)
|
||||
|
||||
Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
|
||||
BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
|
||||
@ -46,6 +50,5 @@ SEARCH on [ FGristFiles
|
||||
] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c tracker.cpp
|
||||
sysdep.c hexdump.c argv.c
|
||||
$(fsShellSources)
|
||||
] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
|
||||
|
@ -3,7 +3,7 @@
|
||||
*
|
||||
* Format:
|
||||
*
|
||||
* static void
|
||||
* static int
|
||||
* function(int argc, char **argv)
|
||||
* {
|
||||
* }
|
||||
@ -17,7 +17,7 @@
|
||||
#include "bfs_control.h"
|
||||
|
||||
|
||||
static void
|
||||
static int
|
||||
do_chkbfs(int argc, char **argv)
|
||||
{
|
||||
struct check_control result;
|
||||
@ -27,7 +27,7 @@ do_chkbfs(int argc, char **argv)
|
||||
int fd = sys_open(1, -1, "/myfs/.", O_RDONLY, S_IFREG, 0);
|
||||
if (fd < 0) {
|
||||
printf("chkbfs: error opening '.'\n");
|
||||
return;
|
||||
return fd;
|
||||
}
|
||||
|
||||
memset(&result, 0, sizeof(result));
|
||||
@ -91,5 +91,7 @@ do_chkbfs(int argc, char **argv)
|
||||
printf("errors have been fixed\n");
|
||||
|
||||
sys_close(1, fd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -8,10 +8,14 @@ SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
|
||||
SubDirCcFlags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
|
||||
}
|
||||
|
||||
local fsShellSources =
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
|
||||
stub.c tracker.cpp sysdep.c hexdump.c argv.c
|
||||
;
|
||||
|
||||
SimpleTest iso9660_shell
|
||||
:
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
|
||||
sysdep.c hexdump.c argv.c tracker.cpp
|
||||
$(fsShellSources)
|
||||
|
||||
iso.c kernel_interface.c
|
||||
:
|
||||
@ -23,6 +27,5 @@ SEARCH on [ FGristFiles
|
||||
] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems iso9660 ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
|
||||
sysdep.c hexdump.c argv.c tracker.cpp
|
||||
$(fsShellSources)
|
||||
] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
|
||||
|
@ -12,10 +12,14 @@ UsePrivateHeaders [ FDirName kernel ] ;
|
||||
SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
|
||||
}
|
||||
|
||||
local fsShellSources =
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
|
||||
stub.c tracker.cpp sysdep.c hexdump.c argv.c
|
||||
;
|
||||
|
||||
SimpleTest udf_shell
|
||||
:
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
|
||||
sysdep.c hexdump.c argv.c tracker.cpp
|
||||
$(fsShellSources)
|
||||
|
||||
udf.cpp
|
||||
DirectoryIterator.cpp DString.cpp Icb.cpp
|
||||
@ -35,6 +39,5 @@ SEARCH on [ FGristFiles
|
||||
] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
|
||||
sysdep.c hexdump.c argv.c tracker.cpp
|
||||
$(fsShellSources)
|
||||
] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
|
||||
|
Loading…
Reference in New Issue
Block a user