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

Some fixes for the Haiku version... it's working!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20209 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-02-23 16:43:29 +00:00
parent 9662cf00d7
commit d436e544a4
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/debugger/hangman/hangman.c
+13 -8
View File
@@ -21,7 +21,7 @@
#define MAX_FAILS_BEFORE_BSOD 0 #define MAX_FAILS_BEFORE_BSOD 0
#ifdef __HAIKU__ #ifdef __HAIKU__
#define FORTUNE_FILE "/etc/fortunes/default/Fortunes" #define FORTUNE_FILE "/etc/fortunes/Fortunes"
#else #else
#define FORTUNE_FILE "/etc/fortunes/default" #define FORTUNE_FILE "/etc/fortunes/default"
#endif #endif
@@ -69,7 +69,7 @@ status_t init_words(char *from);
# ifdef __HAIKU__ # ifdef __HAIKU__
extern int kgets(char *buf, int len); extern int kgets(char *buf, int len);
# define PRINTF kprintf # define PRINTF kprintf
# define GETS(a) ({kprintf("hangman> "); kgets(a, sizeof(a));}) # define GETS(a) ({int l; kprintf("hangman> "); l = kgets(a, sizeof(a)); l?a:NULL;})
# define HIDDEN_LETTER '_' # define HIDDEN_LETTER '_'
# define HUNGMAN hungman_ansi # define HUNGMAN hungman_ansi
# else # else
@@ -112,7 +112,7 @@ status_t init_words(char *from)
// sz = (size_t)lseek(fd, 0, SEEK_END); // sz = (size_t)lseek(fd, 0, SEEK_END);
// dprintf("khangman: lseek(): %ld\n", sz); // dprintf("khangman: lseek(): %ld\n", sz);
if (sz < 30) { if (sz < 30) {
dprintf("khangman: fortune file too small\n"); dprintf("hangman: fortune file too small\n");
return B_ERROR; return B_ERROR;
} }
// lseek(fd, 0, SEEK_SET); // lseek(fd, 0, SEEK_SET);
@@ -296,9 +296,11 @@ status_t init_hardware(void) {
} }
status_t init_driver(void) { status_t init_driver(void) {
status_t err;
if (init_words(FORTUNE_FILE) < B_OK) {
dprintf("error reading fortune file\n"); err = init_words(FORTUNE_FILE);
if (err < B_OK) {
dprintf("hangman: error reading fortune file: %s\n", strerror(err));
return B_ERROR; return B_ERROR;
} }
get_image_symbol(KERNEL_IMAGE_ID, "bsod_gets", B_SYMBOL_TYPE_ANY, (void **)&bsod_gets); get_image_symbol(KERNEL_IMAGE_ID, "bsod_gets", B_SYMBOL_TYPE_ANY, (void **)&bsod_gets);
@@ -376,10 +378,13 @@ device_hooks *find_device(const char *name) {
status_t std_ops(int32 op, ...) status_t std_ops(int32 op, ...)
{ {
status_t err;
switch (op) { switch (op) {
case B_MODULE_INIT: case B_MODULE_INIT:
if (init_words(FORTUNE_FILE) < B_OK) { err = init_words(FORTUNE_FILE);
dprintf("hangman: error reading fortune file.\n"); if (err < B_OK) {
dprintf("hangman: error reading fortune file: %s\n", strerror(err));
return B_ERROR; return B_ERROR;
} }
add_debugger_command("kdlhangman", kdlhangman, KCMD_HELP); add_debugger_command("kdlhangman", kdlhangman, KCMD_HELP);