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

Fixes fortune; it no longer crashes when there are no fortunes in the file.

Browse Source 
Relocated the fortunes file to better match the usual Be locations.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7980 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-15 16:02:45 +00:00
parent 6f4ae5140d
commit 67d9fe3273
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/apps/fortune/main.c
+20 -6
View File
@@ -1,3 +1,8 @@
/*
** Copyright 2002-2004, The OpenBeOS Team. All rights reserved.
** Distributed under the terms of the OpenBeOS License.
*/
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -7,7 +12,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#define FORTUNES "/boot/etc/fortunes" #define FORTUNES "/etc/fortunes"
int int
main(void) main(void)
@@ -27,13 +32,17 @@ main(void)
rc = fstat(fd, &stat); rc = fstat(fd, &stat);
if (rc < 0) { if (rc < 0) {
printf("Cookie monster was here!!!\n"); printf("stat() failed: %s\n", strerror(errno));
exit(1); return -1;
} }
buf = malloc(stat.st_size + 1); buf = malloc(stat.st_size + 1);
rc = read(fd, buf, stat.st_size);
read(fd, buf, stat.st_size); if (rc < 0) {
printf("Could not read from fortune file: %s\n", strerror(errno));
return -1;
}
buf[stat.st_size] = 0; buf[stat.st_size] = 0;
close(fd); close(fd);
@@ -43,7 +52,12 @@ main(void)
found += 1; found += 1;
} }
found = 1 + (system_time() % found); if (found > 0)
found = 1 + ((system_time() + 3) % found);
else {
printf("Out of cookies...\n");
return -1;
}
for (i = 0; i < stat.st_size; i++) { for (i = 0; i < stat.st_size; i++) {
if (!strncmp(buf + i, "#@#", 3)) if (!strncmp(buf + i, "#@#", 3))