From 0562c5887503bccd7444987da412e9a3879a6b41 Mon Sep 17 00:00:00 2001 From: stpohle Date: Tue, 6 May 2003 22:47:05 +0000 Subject: [PATCH] sysfunc.c no without any compiling warning --- src/sysfunc.c | 85 ++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/src/sysfunc.c b/src/sysfunc.c index 56029e0..dab3613 100644 --- a/src/sysfunc.c +++ b/src/sysfunc.c @@ -1,11 +1,11 @@ -/* $Id: sysfunc.c,v 1.4 2003/05/06 21:34:07 stpohle Exp $ - sysfunc.c - this file hold some routines for the system functions.. - like d_delay -*/ - -#include "bomberclone.h" -#include "sysfunc.h" - void +/* $Id: sysfunc.c,v 1.5 2003/05/06 22:47:05 stpohle Exp $ + sysfunc.c - this file hold some routines for the system functions.. + like d_delay +*/ + +#include "bomberclone.h" +#include "sysfunc.h" +void s_delay (int ms) { fd_set selectset; @@ -15,10 +15,12 @@ s_delay (int ms) tval.tv_sec = 0; tval.tv_usec = ms; select (1, &selectset, NULL, NULL, &tval); -} int +}; + +int s_random (int maxnr) { -#ifdef _WIN32 +#ifdef _WIN32 return ((rand () * maxnr) / RAND_MAX); #else int i; @@ -29,21 +31,23 @@ s_random (int maxnr) return i; #endif }; - static char homedir[255]; - char * + +static char homedir[255]; + +char * s_gethomedir () { char *hd; if ((hd = getenv ("HOME")) == NULL) { - /* Homedir konnte nicht ermittelt werden. */ - homedir[0] = 0; + /* Homedir konnte nicht ermittelt werden. */ + homedir[0] = 0; d_printf ("Variable HOME could not be found\n"); } else { strncpy (homedir, hd, 253); homedir[strlen (homedir) + 1] = 0; -#ifdef _WIN32 +#ifdef _WIN32 if (homedir[strlen (homedir) - 1] != '\\') homedir[strlen (homedir)] = '\\'; #else @@ -53,8 +57,11 @@ s_gethomedir () } return homedir; }; - static _direntry direntrys[MAX_DIRENTRYS]; - _direntry * s_getdir (char *path) + +static _direntry direntrys[MAX_DIRENTRYS]; + +_direntry * +s_getdir (char *path) { DIR *dp; struct dirent *ep; @@ -70,7 +77,7 @@ s_gethomedir () if (strlen (ep->d_name) >= LEN_FILENAME) direntrys[entrynr].name[LEN_FILENAME - 1] = 0; - sprintf (filename, "%s/%s\0", path, direntrys[entrynr].name); + sprintf (filename, "%s/%s", path, direntrys[entrynr].name); stat (filename, &fstat); if (S_ISREG (fstat.st_mode)) { direntrys[entrynr].flags = DF_file; @@ -93,25 +100,27 @@ s_gethomedir () return &direntrys[0]; }; +_direntry * +s_dirfilter (_direntry * dirstart, signed char dirflags) +{ + _direntry *newstart = NULL, + *pos = NULL, + *old = NULL; -_direntry *s_dirfilter (_direntry *dirstart, signed char dirflags) { - _direntry *newstart = NULL, *pos = NULL, *old = NULL; - - for (pos = dirstart; pos != NULL; pos = pos->next) - if (pos->name[0] != '.' && (pos->flags & dirflags) != 0) { - if (newstart == NULL) { - newstart = pos; - old = pos; - } - else { - old->next = pos; - old = pos; - } - } - - if (old != NULL) - old->next = NULL; - - return newstart; -}; + for (pos = dirstart; pos != NULL; pos = pos->next) + if (pos->name[0] != '.' && (pos->flags & dirflags) != 0) { + if (newstart == NULL) { + newstart = pos; + old = pos; + } + else { + old->next = pos; + old = pos; + } + } + + if (old != NULL) + old->next = NULL; + return newstart; +};