i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct syscall for Haiku; better error reporting; testing code

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10169 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2004-11-22 15:27:08 +00:00
parent 34b765e03b
commit 390738c37c
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/libroot/os/find_directory.c
+30 -5
View File
@@ -157,7 +157,7 @@ status_t find_directory (directory_which which, dev_t device, bool create_it, ch
dev_t bootdev = -1;
struct fs_info finfo;
struct stat st;
char *buffer;
char *buffer = NULL;
char *home = NULL;
const char *template = NULL;
@@ -214,7 +214,7 @@ status_t find_directory (directory_which which, dev_t device, bool create_it, ch
} else
err = ENODEV;
#else
strncat(buffer, "/wincrash", 9); // XXX: TODO
err = _kern_entry_ref_to_path(device, finfo.root, /*"."*/ NULL, buffer, path_length);
#endif
} else {
/* use the user id to find the home folder */
@@ -226,6 +226,10 @@ status_t find_directory (directory_which which, dev_t device, bool create_it, ch
strncat(buffer, "/boot", path_length);
break;
}
if (err < B_OK) {
free(buffer);
return err;
}
switch (which) {
case B_DESKTOP_DIRECTORY:
@@ -350,10 +354,31 @@ status_t find_directory (directory_which which, dev_t device, bool create_it, ch
return err;
}
#if 0
/* <AbsFab>
* testing testing testing... I can hear you darling!
* This is big-mother speaking !!!
* <AbsFab>
* cc -DMAIN_FOR_TEST -DCOMPILE_FOR_R5 find_directory.c -o find_directory
*/
#ifdef MAIN_FOR_TEST
int main(int argc, char **argv)
{
printf("mkdir %d\n", mkdir_p(argv[1], 0755));
perror("mkdir");
status_t err;
int i;
dev_t dev = -1;
char buffer[B_PATH_NAME_LENGTH];
//printf("mkdir %d\n", mkdir_p(argv[1], 0755));
//perror("mkdir");
if (argc > 1)
dev = dev_for_path(argv[1]);
for (i = B_DESKTOP_DIRECTORY; i < B_UTILITIES_DIRECTORY; i++) {
err = find_directory((directory_which)i, dev, false, buffer, B_PATH_NAME_LENGTH);
if (err)
continue;
printf("dir[%04d] = '%s'\n", i, buffer);
}
return 0;
}
#endif