From 1465ec71a0b4bb927ce8d20dafcdf49e33f53073 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 13 Dec 2017 23:17:33 -0500 Subject: [PATCH] build/kernel: Properly shadow syscall functions. I didn't notice this in the previous commit because apparently GCC2 just links against libroot's versions of them. On GCC5, however, the version from libroot_build was used even for calls from libroot itself, which led to infinite loops and then stack overflows. So instead we must have the "syscall" functions in libroot_build shadow the real ones by being named differently, which I did by changing their prefix from "_kern" to "_kernbuild" via preprocessor macros. Since the build syscalls.h is now substantially different than the non- build one (and has not been synchronized in nearly a decade anyway), I've just stripped out all the syscall defns except for the ones actually used in the build. Thanks to kallisti5 for helping me debug and test. --- headers/build/private/kernel/syscalls.h | 441 +++--------------------- src/tools/fs_shell/unistd.cpp | 4 +- 2 files changed, 52 insertions(+), 393 deletions(-) diff --git a/headers/build/private/kernel/syscalls.h b/headers/build/private/kernel/syscalls.h index 9b47c2e5fc..74164156ed 100644 --- a/headers/build/private/kernel/syscalls.h +++ b/headers/build/private/kernel/syscalls.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2005, Haiku Inc. All rights reserved. + * Copyright 2004-2017, Haiku Inc. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef _KERNEL_SYSCALLS_H @@ -8,432 +8,93 @@ #include #include -//#include -#include - -//#include -#include #ifdef __cplusplus extern "C" { #endif -struct sigaction; -struct rlimit; + +/* Since libroot_build is also used on Haiku and linked against the real + * libroot which also has the syscall functions, these must be shadowed. */ +#define _kern_entry_ref_to_path _kernbuild_entry_ref_to_path +#define _kern_open_entry_ref _kernbuild_open_entry_ref +#define _kern_open _kernbuild_open +#define _kern_open_dir_entry_ref _kernbuild_open_dir_entry_ref +#define _kern_open_dir _kernbuild_open_dir +#define _kern_open_parent_dir _kernbuild_open_parent_dir +#define _kern_fsync _kernbuild_fsync +#define _kern_seek _kernbuild_seek +#define _kern_create_dir_entry_ref _kernbuild_create_dir_entry_ref +#define _kern_create_dir _kernbuild_create_dir +#define _kern_read_link _kernbuild_read_link +#define _kern_create_symlink _kernbuild_create_symlink +#define _kern_unlink _kernbuild_unlink +#define _kern_rename _kernbuild_rename +#define _kern_open_attr_dir _kernbuild_open_attr_dir +#define _kern_remove_attr _kernbuild_remove_attr +#define _kern_rename_attr _kernbuild_rename_attr +#define _kern_read _kernbuild_read +#define _kern_write _kernbuild_write +#define _kern_read_dir _kernbuild_read_dir +#define _kern_rewind_dir _kernbuild_rewind_dir +#define _kern_read_stat _kernbuild_read_stat +#define _kern_write_stat _kernbuild_write_stat +#define _kern_close _kernbuild_close +#define _kern_dup _kernbuild_dup +#define _kern_lock_node _kernbuild_lock_node +#define _kern_unlock_node _kernbuild_unlock_node + + struct stat; -struct pollfd; -struct fs_info; struct dirent; -// This marks the beginning of the syscalls prototypes for gensyscallinfos. -// NOTE: -// * Nothing but those prototypes may live here. -// * The arguments of the functions must be named to be processed properly. - -#ifdef GEN_SYSCALL_INFOS_PROCESSING -#pragma syscalls begin -#endif - -extern int _kern_null(); -extern status_t _kern_generic_syscall(const char *subsystem, uint32 function, - void *buffer, size_t bufferSize); - -extern int _kern_getrlimit(int resource, struct rlimit * rlp); -extern int _kern_setrlimit(int resource, const struct rlimit * rlp); - -extern status_t _kern_shutdown(bool reboot); -extern status_t _kern_get_safemode_option(const char *parameter, char *buffer, size_t *_bufferSize); - -/* sem functions */ -extern sem_id _kern_create_sem(int count, const char *name); -extern status_t _kern_delete_sem(sem_id id); -extern status_t _kern_switch_sem(sem_id releaseSem, sem_id id); -extern status_t _kern_switch_sem_etc(sem_id releaseSem, sem_id id, uint32 count, - uint32 flags, bigtime_t timeout); -extern status_t _kern_acquire_sem(sem_id id); -extern status_t _kern_acquire_sem_etc(sem_id id, uint32 count, uint32 flags, bigtime_t timeout); -extern status_t _kern_release_sem(sem_id id); -extern status_t _kern_release_sem_etc(sem_id id, uint32 count, uint32 flags); -extern status_t _kern_get_sem_count(sem_id id, int32* thread_count); -extern status_t _kern_get_sem_info(sem_id semaphore, struct sem_info *info, size_t size); -extern status_t _kern_get_next_sem_info(team_id team, uint32 *cookie, - struct sem_info *info, size_t size); -extern status_t _kern_set_sem_owner(sem_id id, team_id proc); - -/* team & thread syscalls */ - -// extern thread_id _kern_load_image(int32 argCount, const char **args, -// int32 envCount, const char **envp, int32 priority, -// uint32 flags); -// extern void _kern_exit_team(status_t returnValue); -// extern status_t _kern_kill_team(team_id team); -// extern team_id _kern_get_current_team(); -// extern status_t _kern_wait_for_team(team_id team, status_t *_returnCode); -// extern thread_id _kern_wait_for_child(thread_id child, uint32 flags, -// int32 *_reason, status_t *_returnCode); -// extern status_t _kern_exec(const char *path, int32 argc, char * const *argv, int32 envCount, -// char * const *environment); -// extern thread_id _kern_fork(void); -// extern pid_t _kern_process_info(pid_t process, int32 which); -// extern pid_t _kern_setpgid(pid_t process, pid_t group); -// extern pid_t _kern_setsid(void); - -// extern thread_id _kern_spawn_thread(int32 (*func)(thread_func, void *), -// const char *name, int32 priority, void *data1, void *data2); -// extern thread_id _kern_find_thread(const char *name); -// extern status_t _kern_suspend_thread(thread_id thread); -// extern status_t _kern_resume_thread(thread_id thread); -// extern status_t _kern_rename_thread(thread_id thread, const char *newName); -// extern status_t _kern_set_thread_priority(thread_id thread, int32 newPriority); -// extern status_t _kern_kill_thread(thread_id thread); -// extern void _kern_exit_thread(status_t returnValue); -// extern status_t _kern_wait_for_thread(thread_id thread, status_t *_returnCode); -// extern bool _kern_has_data(thread_id thread); -// extern status_t _kern_send_data(thread_id thread, int32 code, const void *buffer, size_t bufferSize); -// extern int32 _kern_receive_data(thread_id *_sender, void *buffer, size_t bufferSize); -// extern int64 _kern_restore_signal_frame(); - -// extern status_t _kern_get_thread_info(thread_id id, thread_info *info); -// extern status_t _kern_get_next_thread_info(team_id team, int32 *cookie, thread_info *info); -// extern status_t _kern_get_team_info(team_id id, team_info *info); -// extern status_t _kern_get_next_team_info(int32 *cookie, team_info *info); -// extern status_t _kern_get_team_usage_info(team_id team, int32 who, team_usage_info *info, size_t size); - -// signal functions -// extern int _kern_send_signal(pid_t tid, uint sig); -// extern int _kern_sigprocmask(int how, const sigset_t *set, sigset_t *oldSet); -// extern int _kern_sigaction(int sig, const struct sigaction *action, struct sigaction *oldAction); -// extern bigtime_t _kern_set_alarm(bigtime_t time, uint32 mode); - -// image functions -// extern image_id _kern_register_image(image_info *info, size_t size); -// extern status_t _kern_unregister_image(image_id id); -// extern void _kern_image_relocated(image_id id); -// extern void _kern_loading_app_failed(status_t error); -// extern status_t _kern_get_image_info(image_id id, image_info *info, size_t size); -// extern status_t _kern_get_next_image_info(team_id team, int32 *cookie, image_info *info, size_t size); - -// VFS functions -// extern status_t _kern_mount(const char *path, const char *device, -// const char *fs_name, uint32 flags, const char *args); -// extern status_t _kern_unmount(const char *path, uint32 flags); -// extern status_t _kern_read_fs_info(dev_t device, struct fs_info *info); -// extern status_t _kern_write_fs_info(dev_t device, const struct fs_info *info, int mask); -// extern dev_t _kern_next_device(int32 *_cookie); -// extern status_t _kern_sync(void); extern status_t _kern_entry_ref_to_path(dev_t device, ino_t inode, const char *leaf, char *userPath, size_t pathLength); -extern int _kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int openMode, int perms); -extern int _kern_open(int fd, const char *path, int openMode, int perms); -extern int _kern_open_dir_entry_ref(dev_t device, ino_t inode, const char *name); +extern int _kern_open_entry_ref(dev_t device, ino_t inode, + const char *name, int openMode, int perms); +extern int _kern_open(int fd, const char *path, int openMode, + int perms); +extern int _kern_open_dir_entry_ref(dev_t device, ino_t inode, + const char *name); extern int _kern_open_dir(int fd, const char *path); extern int _kern_open_parent_dir(int fd, char *name, size_t nameLength); -// extern status_t _kern_fcntl(int fd, int op, uint32 argument); extern status_t _kern_fsync(int fd); extern off_t _kern_seek(int fd, off_t pos, int seekType); -extern status_t _kern_create_dir_entry_ref(dev_t device, ino_t inode, const char *name, int perms); +extern status_t _kern_create_dir_entry_ref(dev_t device, ino_t inode, + const char *name, int perms); extern status_t _kern_create_dir(int fd, const char *path, int perms); -// extern status_t _kern_remove_dir(const char *path); extern status_t _kern_read_link(int fd, const char *path, char *buffer, size_t *_bufferSize); -// extern status_t _kern_write_link(const char *path, const char *toPath); extern status_t _kern_create_symlink(int fd, const char *path, const char *toPath, int mode); -// extern status_t _kern_create_link(const char *path, const char *toPath); extern status_t _kern_unlink(int fd, const char *path); extern status_t _kern_rename(int oldDir, const char *oldpath, int newDir, const char *newpath); -// extern status_t _kern_access(const char *path, int mode); -// extern ssize_t _kern_select(int numfds, fd_set *readSet, fd_set *writeSet, fd_set *errorSet, -// bigtime_t timeout, const sigset_t *sigMask); -// extern ssize_t _kern_poll(struct pollfd *fds, int numfds, bigtime_t timeout); extern int _kern_open_attr_dir(int fd, const char *path); -// extern int _kern_create_attr(int fd, const char *name, uint32 type, int openMode); -// extern int _kern_open_attr(int fd, const char *name, int openMode); extern status_t _kern_remove_attr(int fd, const char *name); -extern status_t _kern_rename_attr(int fromFile, const char *fromName, int toFile, const char *toName); -// extern int _kern_open_index_dir(dev_t device); -// extern status_t _kern_create_index(dev_t device, const char *name, uint32 type, uint32 flags); -// extern status_t _kern_read_index_stat(dev_t device, const char *name, struct stat *stat); -// extern status_t _kern_remove_index(dev_t device, const char *name); -// extern status_t _kern_getcwd(char *buffer, size_t size); -// extern status_t _kern_setcwd(int fd, const char *path); -// extern int _kern_open_query(dev_t device, const char *query, size_t queryLength, -// uint32 flags, port_id port, int32 token); +extern status_t _kern_rename_attr(int fromFile, const char *fromName, + int toFile, const char *toName); // file descriptor functions -extern ssize_t _kern_read(int fd, off_t pos, void *buffer, size_t bufferSize); -//extern ssize_t _kern_readv(int fd, off_t pos, const iovec *vecs, size_t count); -extern ssize_t _kern_write(int fd, off_t pos, const void *buffer, size_t bufferSize); -//extern ssize_t _kern_writev(int fd, off_t pos, const iovec *vecs, size_t count); -// extern status_t _kern_ioctl(int fd, ulong cmd, void *data, size_t length); -extern ssize_t _kern_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); +extern ssize_t _kern_read(int fd, off_t pos, void *buffer, + size_t bufferSize); +extern ssize_t _kern_write(int fd, off_t pos, const void *buffer, + size_t bufferSize); +extern ssize_t _kern_read_dir(int fd, struct dirent *buffer, + size_t bufferSize, uint32 maxCount); extern status_t _kern_rewind_dir(int fd); -extern status_t _kern_read_stat(int fd, const char *path, bool traverseLink, - struct stat *stat, size_t statSize); +extern status_t _kern_read_stat(int fd, const char *path, + bool traverseLink, struct stat *stat, size_t statSize); extern status_t _kern_write_stat(int fd, const char *path, bool traverseLink, const struct stat *stat, size_t statSize, int statMask); extern status_t _kern_close(int fd); extern int _kern_dup(int fd); -// extern int _kern_dup2(int ofd, int nfd); extern status_t _kern_lock_node(int fd); extern status_t _kern_unlock_node(int fd); -// node monitor functions -// extern status_t _kern_stop_notifying(port_id port, uint32 token); -// extern status_t _kern_start_watching(dev_t device, ino_t node, uint32 flags, -// port_id port, uint32 token); -// extern status_t _kern_stop_watching(dev_t device, ino_t node, uint32 flags, -// port_id port, uint32 token); - -// time functions -// extern status_t _kern_set_real_time_clock(uint32 time); -// extern status_t _kern_set_timezone(int32 timezoneOffset, bool daylightSavingTime); -// extern status_t _kern_set_tzfilename(const char *filename, size_t length, bool isGMT); -// extern status_t _kern_get_tzfilename(char *filename, size_t length, bool *_isGMT); -// -// extern bigtime_t _kern_system_time(); -// extern status_t _kern_snooze_etc(bigtime_t time, int timebase, int32 flags); - -// area functions -// extern area_id _kern_create_area(const char *name, void **address, uint32 addressSpec, -// size_t size, uint32 lock, uint32 protection); -// extern status_t _kern_delete_area(area_id area); -// extern area_id _kern_area_for(void *address); -// extern area_id _kern_find_area(const char *name); -// extern status_t _kern_get_area_info(area_id area, area_info *info); -// extern status_t _kern_get_next_area_info(team_id team, int32 *cookie, area_info *info); -// extern status_t _kern_resize_area(area_id area, size_t newSize); -// extern area_id _kern_transfer_area(area_id area, void **_address, uint32 addressSpec, -// team_id target); -// extern status_t _kern_set_area_protection(area_id area, uint32 newProtection); -// extern area_id _kern_clone_area(const char *name, void **_address, uint32 addressSpec, -// uint32 protection, area_id sourceArea); -// extern status_t _kern_init_heap_address_range(addr_t base, addr_t size); -// -// area_id sys_vm_map_file(const char *name, void **address, int addr_type, -// addr_t size, int lock, int mapping, const char *path, off_t offset); - -/* kernel port functions */ -// extern port_id _kern_create_port(int32 queue_length, const char *name); -// extern status_t _kern_close_port(port_id id); -// extern status_t _kern_delete_port(port_id id); -// extern port_id _kern_find_port(const char *port_name); -// extern status_t _kern_get_port_info(port_id id, struct port_info *info); -// extern status_t _kern_get_next_port_info(team_id team, uint32 *cookie, struct port_info *info); -// extern ssize_t _kern_port_buffer_size_etc(port_id port, uint32 flags, bigtime_t timeout); -// extern int32 _kern_port_count(port_id port); -// extern ssize_t _kern_read_port_etc(port_id port, int32 *msgCode, void *msgBuffer, -// size_t bufferSize, uint32 flags, bigtime_t timeout); -// extern status_t _kern_set_port_owner(port_id port, team_id team); -// extern status_t _kern_write_port_etc(port_id port, int32 msgCode, const void *msgBuffer, -// size_t bufferSize, uint32 flags, bigtime_t timeout); -// extern status_t _kern_writev_port_etc(port_id id, int32 msgCode, const iovec *msgVecs, -// size_t vecCount, size_t bufferSize, uint32 flags, bigtime_t timeout); - -// debug support functions -// extern void _kern_debugger(const char *message); -// extern int _kern_disable_debugger(int state); -// -// extern status_t _kern_install_default_debugger(port_id debuggerPort); -// extern port_id _kern_install_team_debugger(team_id team, -// port_id debuggerPort); -// extern status_t _kern_remove_team_debugger(team_id team); -// extern status_t _kern_debug_thread(thread_id thread); -// extern void _kern_wait_for_debugger(void); - - -/* atomic_* ops (needed for CPUs that don't support them directly) */ -// #ifdef ATOMIC_FUNCS_ARE_SYSCALLS -// extern int32 _kern_atomic_set(vint32 *value, int32 newValue); -// extern int32 _kern_atomic_test_and_set(vint32 *value, int32 newValue, int32 testAgainst); -// extern int32 _kern_atomic_add(vint32 *value, int32 addValue); -// extern int32 _kern_atomic_and(vint32 *value, int32 andValue); -// extern int32 _kern_atomic_or(vint32 *value, int32 orValue); -// extern int32 _kern_atomic_get(vint32 *value); -// #endif // ATOMIC_FUNCS_ARE_SYSCALLS - -// #ifdef ATOMIC64_FUNCS_ARE_SYSCALLS -// extern int64 _kern_atomic_set64(vint64 *value, int64 newValue); -// extern int64 _kern_atomic_test_and_set64(vint64 *value, int64 newValue, int64 testAgainst); -// extern int64 _kern_atomic_add64(vint64 *value, int64 addValue); -// extern int64 _kern_atomic_and64(vint64 *value, int64 andValue); -// extern int64 _kern_atomic_or64(vint64 *value, int64 orValue); -// extern int64 _kern_atomic_get64(vint64 *value); -// #endif // ATOMIC64_FUNCS_ARE_SYSCALLS - -// int sys_sysctl(int *name, uint namlen, void *oldp, size_t *oldlen, -// void *newp, size_t newlen); -// int sys_socket(int family, int type, int proto); - -/* System informations */ -// extern status_t _kern_get_system_info(system_info *info, size_t size); - -/* Debug output */ -// extern void _kern_debug_output(const char *message); -// extern status_t _kern_frame_buffer_update(addr_t baseAddress, int32 width, -// int32 height, int32 depth, int32 bytesPerRow); - -/* messaging service */ -// extern area_id _kern_register_messaging_service(sem_id lockingSem, -// sem_id counterSem); -// extern status_t _kern_unregister_messaging_service(); -// -// extern void _kern_clear_caches(void *address, size_t length, uint32 flags); - -// #ifdef __INTEL__ -// // our only x86 only syscall -// extern status_t _kern_get_cpuid(cpuid_info *info, uint32 eax, uint32 cpu); -// #endif - - -/* Disk Device Manager syscalls */ - -// iterating, retrieving device/partition data -extern partition_id _kern_get_next_disk_device_id(int32 *cookie, size_t *neededSize); -extern partition_id _kern_find_disk_device(const char *filename, size_t *neededSize); -extern partition_id _kern_find_partition(const char *filename, size_t *neededSize); -extern status_t _kern_get_disk_device_data(partition_id deviceID, bool deviceOnly, - bool shadow, struct user_disk_device_data *buffer, - size_t bufferSize, size_t *neededSize); -extern partition_id _kern_register_file_device(const char *filename); -extern status_t _kern_unregister_file_device(partition_id deviceID, - const char *filename); - // Only a valid deviceID or filename need to be passed. The other one - // is -1/NULL. If both is given only filename is ignored. - -// disk systems -extern status_t _kern_get_disk_system_info(disk_system_id id, - struct user_disk_system_info *info); -extern status_t _kern_get_next_disk_system_info(int32 *cookie, - struct user_disk_system_info *info); -extern status_t _kern_find_disk_system(const char *name, - struct user_disk_system_info *info); -extern bool _kern_supports_defragmenting_partition(partition_id partitionID, - int32 changeCounter, bool *whileMounted); -extern bool _kern_supports_repairing_partition(partition_id partitionID, - int32 changeCounter, bool checkOnly, bool *whileMounted); -extern bool _kern_supports_resizing_partition(partition_id partitionID, - int32 changeCounter, bool *canResizeContents, bool *whileMounted); -extern bool _kern_supports_moving_partition(partition_id partitionID, - int32 changeCounter, partition_id *unmovable, - partition_id *needUnmounting, size_t bufferSize); -extern bool _kern_supports_setting_partition_name(partition_id partitionID, - int32 changeCounter); -extern bool _kern_supports_setting_partition_content_name(partition_id partitionID, - int32 changeCounter, bool *whileMounted); -extern bool _kern_supports_setting_partition_type(partition_id partitionID, - int32 changeCounter); -extern bool _kern_supports_setting_partition_parameters(partition_id partitionID, - int32 changeCounter); -extern bool _kern_supports_setting_partition_content_parameters( - partition_id partitionID, int32 changeCounter, bool *whileMounted); -extern bool _kern_supports_initializing_partition(partition_id partitionID, - int32 changeCounter, const char *diskSystemName); -extern bool _kern_supports_creating_child_partition(partition_id partitionID, - int32 changeCounter); -extern bool _kern_supports_deleting_child_partition(partition_id partitionID, - int32 changeCounter); -extern bool _kern_is_sub_disk_system_for(disk_system_id diskSystemID, - partition_id partitionID, int32 changeCounter); - -extern status_t _kern_validate_resize_partition(partition_id partitionID, - int32 changeCounter, off_t *size); -extern status_t _kern_validate_move_partition(partition_id partitionID, - int32 changeCounter, off_t *newOffset); -extern status_t _kern_validate_set_partition_name(partition_id partitionID, - int32 changeCounter, char *name); -extern status_t _kern_validate_set_partition_content_name(partition_id partitionID, - int32 changeCounter, char *name); -extern status_t _kern_validate_set_partition_type(partition_id partitionID, - int32 changeCounter, const char *type); -extern status_t _kern_validate_initialize_partition(partition_id partitionID, - int32 changeCounter, const char *diskSystemName, - char *name, const char *parameters, size_t parametersSize); -extern status_t _kern_validate_create_child_partition(partition_id partitionID, - int32 changeCounter, off_t *offset, off_t *size, - const char *type, const char *parameters, - size_t parametersSize); -extern status_t _kern_get_partitionable_spaces(partition_id partitionID, - int32 changeCounter, - struct partitionable_space_data *buffer, int32 count, - int32 *actualCount); -extern status_t _kern_get_next_supported_partition_type(partition_id partitionID, - int32 changeCounter, int32 *cookie, char *type); -extern status_t _kern_get_partition_type_for_content_type(disk_system_id diskSystemID, - const char *contentType, char *type); - -// disk device modification -extern status_t _kern_prepare_disk_device_modifications(partition_id deviceID); -extern status_t _kern_commit_disk_device_modifications(partition_id deviceID, - port_id port, int32 token, bool completeProgress); -extern status_t _kern_cancel_disk_device_modifications(partition_id deviceID); -extern bool _kern_is_disk_device_modified(partition_id deviceID); -extern status_t _kern_defragment_partition(partition_id partitionID, - int32 changeCounter); -extern status_t _kern_repair_partition(partition_id partitionID, int32 changeCounter, - bool checkOnly); -extern status_t _kern_resize_partition(partition_id partitionID, int32 changeCounter, - off_t size); -extern status_t _kern_move_partition(partition_id partitionID, int32 changeCounter, - off_t newOffset); -extern status_t _kern_set_partition_name(partition_id partitionID, - int32 changeCounter, const char *name); -extern status_t _kern_set_partition_content_name(partition_id partitionID, - int32 changeCounter, const char *name); -extern status_t _kern_set_partition_type(partition_id partitionID, - int32 changeCounter, const char *type); -extern status_t _kern_set_partition_parameters(partition_id partitionID, - int32 changeCounter, const char *parameters, - size_t parametersSize); -extern status_t _kern_set_partition_content_parameters(partition_id partitionID, - int32 changeCounter, const char *parameters, - size_t parametersSize); -extern status_t _kern_initialize_partition(partition_id partitionID, - int32 changeCounter, const char *diskSystemName, - const char *name, const char *parameters, - size_t parametersSize); -extern status_t _kern_uninitialize_partition(partition_id partitionID, - int32 changeCounter, partition_id parentID, - int32 parentChangeCounter); -extern status_t _kern_create_child_partition(partition_id partitionID, - int32 changeCounter, off_t offset, off_t size, const char *type, - const char *parameters, size_t parametersSize, - partition_id *childID); -extern status_t _kern_delete_partition(partition_id partitionID, int32 changeCounter); -extern status_t _kern_delete_child_partition(partition_id partitionID, - int32* changeCounter, partition_id childID, - int32 childChangeCounter); - -// jobs -extern status_t _kern_get_next_disk_device_job_info(int32 *cookie, - struct user_disk_device_job_info *info); -extern status_t _kern_get_disk_device_job_info(disk_job_id id, - struct user_disk_device_job_info *info); -extern status_t _kern_get_disk_device_job_progress_info(disk_job_id id, - struct disk_device_job_progress_info *info); -extern status_t _kern_pause_disk_device_job(disk_job_id id); -extern status_t _kern_cancel_disk_device_job(disk_job_id id, bool reverse); - -#if 0 - -// watching -status_t start_disk_device_watching(port_id, int32 token, uint32 flags); -status_t start_disk_device_job_watching(disk_job_id job, port_id, int32 token, - uint32 flags); -status_t stop_disk_device_watching(port_id, int32 token); - -#endif // 0 - - -// The end mark for gensyscallinfos. -#ifdef GEN_SYSCALL_INFOS_PROCESSING -#pragma syscalls end -#endif - #ifdef __cplusplus } #endif diff --git a/src/tools/fs_shell/unistd.cpp b/src/tools/fs_shell/unistd.cpp index bcc5bcd930..b07eaac61c 100644 --- a/src/tools/fs_shell/unistd.cpp +++ b/src/tools/fs_shell/unistd.cpp @@ -43,9 +43,7 @@ #if (!defined(__BEOS__) && !defined(__HAIKU__)) - // Defined in libroot_build.so. - extern "C" int _kern_dup(int fd); - extern "C" status_t _kern_close(int fd); +# include "syscalls.h" #endif