Compare commits

..

1 Commits

Author SHA1 Message Date
fe1b5cdbd0
Code cleanup and indentation. 2023-03-03 22:49:48 +01:00
20 changed files with 594 additions and 676 deletions

2
.gitignore vendored
View File

@ -3,6 +3,4 @@ config.h
config.log config.log
config.status config.status
src/*.o src/*.o
src/*.c~
src/*.h~
src/mboxgrep src/mboxgrep

View File

@ -13,6 +13,3 @@ GNU/Linux distrubution, for example), please drop me a line about it.
For build instructions, read the file "INSTALL", and run For build instructions, read the file "INSTALL", and run
`./configure --help`. `./configure --help`.
This project aims to follow the GNU coding style (https://www.gnu.org/prep/standards/html_node/Formatting.html),
at least loosely. The code should be indented with indent -gnu -nut -ppi2.

View File

@ -36,8 +36,7 @@ print_wrap (char *str, int len, int *n)
fprintf (stdout, "\n"); fprintf (stdout, "\n");
*n = 0; *n = 0;
} }
else else fprintf (stdout, " ");
fprintf (stdout, " ");
} }
void void
@ -67,8 +66,7 @@ version (void)
#else #else
# ifdef HAVE_FTW # ifdef HAVE_FTW
print_wrap ("HAVE_FTW", 8, &n); print_wrap ("HAVE_FTW", 8, &n);
# endif # endif /* HAVE_FTW */
/* HAVE_FTW */
#endif /* HAVE_FTS_OPEN */ #endif /* HAVE_FTS_OPEN */
/* /*
fprintf (stdout, "HAVE_LIBLOCKFILE "); fprintf (stdout, "HAVE_LIBLOCKFILE ");

View File

@ -30,16 +30,13 @@
# define NAMLEN(dirent) (dirent)->d_namlen # define NAMLEN(dirent) (dirent)->d_namlen
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */
#endif /* HAVE_DIRENT_H */ #endif /* HAVE_DIRENT_H */
#include <stdlib.h> #include <stdlib.h>
@ -160,8 +157,7 @@ maildir_read_message (maildir_t * mdp)
filename = filename =
(char *) xmalloc ((sizeof (char)*((strlen (d_content->d_name)) (char *) xmalloc ((sizeof (char)*((strlen (d_content->d_name))
+ (strlen (config.boxname)) + + (strlen (config.boxname)) + 6)));
6)));
/* /*
filename = filename =
@ -207,8 +203,7 @@ maildir_read_message (maildir_t * mdp)
message->headers = message->headers =
(char *) xrealloc (message->headers, (char *) xrealloc (message->headers,
((1 + s + ((1 + s + message->hbytes) * sizeof (char)));
message->hbytes) * sizeof (char)));
strcpy (message->headers + message->hbytes, buffer); strcpy (message->headers + message->hbytes, buffer);
message->hbytes += s; message->hbytes += s;
@ -217,8 +212,7 @@ maildir_read_message (maildir_t * mdp)
{ {
message->body = message->body =
(char *) xrealloc (message->body, (char *) xrealloc (message->body,
((1 + s + ((1 + s + message->bbytes) * sizeof (char)));
message->bbytes) * sizeof (char)));
strcpy (message->body + message->bbytes, buffer); strcpy (message->body + message->bbytes, buffer);
message->bbytes += s; message->bbytes += s;
} /* else */ } /* else */
@ -274,24 +268,18 @@ maildir_check (const char *path)
sprintf (s, "%s/cur", path); sprintf (s, "%s/cur", path);
i = stat (s, &fs); i = stat (s, &fs);
if (-1 == i) if (-1 == i) return -1;
return -1; if (! S_ISDIR (fs.st_mode)) return -1;
if (!S_ISDIR (fs.st_mode))
return -1;
sprintf (s, "%s/new", path); sprintf (s, "%s/new", path);
i = stat (s, &fs); i = stat (s, &fs);
if (-1 == i) if (-1 == i) return -1;
return -1; if (! S_ISDIR (fs.st_mode)) return -1;
if (!S_ISDIR (fs.st_mode))
return -1;
sprintf(s, "%s/tmp", path); sprintf(s, "%s/tmp", path);
i = stat (s, &fs); i = stat (s, &fs);
if (-1 == i) if (-1 == i) return -1;
return -1; if (! S_ISDIR (fs.st_mode)) return -1;
if (!S_ISDIR (fs.st_mode))
return -1;
free (s); free (s);

View File

@ -30,18 +30,14 @@
# define NAMLEN(dirent) (dirent)->d_namlen # define NAMLEN(dirent) (dirent)->d_namlen
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */ #endif /* HAVE_DIRENT_H */
# endif
/* HAVE_DIRENT_H */
#include "mboxgrep.h" #include "mboxgrep.h"

View File

@ -54,7 +54,8 @@ main (int argc, char **argv)
runtime.count = 0; runtime.count = 0;
runtime.maildir_count = 0; runtime.maildir_count = 0;
static struct option long_options[] = { static struct option long_options[] =
{
{"count", 0, 0, 'c'}, {"count", 0, 0, 'c'},
{"delete", 0, 0, 'd'}, {"delete", 0, 0, 'd'},
/* {"date", 1, 0, 'D'}, */ /* {"date", 1, 0, 'D'}, */

View File

@ -193,8 +193,7 @@ mbox_open (const char *path, const char *mode)
fprintf (stderr, "%s: (standard input): Not a mbox folder\n", fprintf (stderr, "%s: (standard input): Not a mbox folder\n",
APPNAME); APPNAME);
else else
fprintf (stderr, "%s: %s: Not a mbox folder\n", APPNAME, fprintf (stderr, "%s: %s: Not a mbox folder\n", APPNAME, path);
path);
} }
if (config.format == MBOX) if (config.format == MBOX)
fclose (mp->fp); fclose (mp->fp);
@ -403,14 +402,11 @@ tmpfile_mod_own (const int fd, const char *path)
if (stat (path, &s) != -1) if (stat (path, &s) != -1)
{ {
if (fchown (fd, s.st_uid, s.st_gid) == -1) if (fchown (fd, s.st_uid, s.st_gid) == -1)
if (config.merr) if (config.merr) perror (config.tmpfilename);
perror (config.tmpfilename);
if (fchmod (fd, s.st_mode) == -1) if (fchmod (fd, s.st_mode) == -1)
if (config.merr) if (config.merr) perror (config.tmpfilename);
perror (config.tmpfilename);
} }
else if (config.merr) else if (config.merr) perror (path);
perror (path);
} }
} }

View File

@ -29,16 +29,13 @@
# define NAMLEN(dirent) (dirent)->d_namlen # define NAMLEN(dirent) (dirent)->d_namlen
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */
#endif /* HAVE_DIRENT_H */ #endif /* HAVE_DIRENT_H */
#include <sys/types.h> #include <sys/types.h>
@ -57,8 +54,7 @@
extern option_t config; extern option_t config;
DIR * DIR *mh_open (const char *path)
mh_open (const char *path)
{ {
DIR *dp; DIR *dp;
@ -76,14 +72,12 @@ mh_open (const char *path)
return dp; return dp;
} /* mh_open */ } /* mh_open */
void void mh_close (DIR *dp)
mh_close (DIR * dp)
{ {
closedir (dp); closedir (dp);
} /* mh_close */ } /* mh_close */
message_t * message_t *mh_read_message (DIR *dp)
mh_read_message (DIR * dp)
{ {
int isheaders = 1; int isheaders = 1;
int have_from = 0, have_date = 0, have_sender = 0; int have_from = 0, have_date = 0, have_sender = 0;
@ -100,8 +94,7 @@ mh_read_message (DIR * dp)
for(;;) for(;;)
{ {
d_content = readdir(dp); d_content = readdir(dp);
if (d_content == NULL) if (d_content == NULL) return NULL;
return NULL;
if (d_content->d_name[0] == '.') if (d_content->d_name[0] == '.')
continue; continue;
@ -168,8 +161,7 @@ mh_read_message (DIR * dp)
message->headers = message->headers =
(char *) realloc (message->headers, (char *) realloc (message->headers,
((1 + s + ((1 + s + message->hbytes) * sizeof (char)));
message->hbytes) * sizeof (char)));
strcpy (message->headers + message->hbytes, buffer); strcpy (message->headers + message->hbytes, buffer);
message->hbytes += s; message->hbytes += s;
} /* if */ } /* if */
@ -177,8 +169,7 @@ mh_read_message (DIR * dp)
{ {
message->body = message->body =
(char *) realloc (message->body, (char *) realloc (message->body,
((1 + s + ((1 + s + message->bbytes) * sizeof (char)));
message->bbytes) * sizeof (char)));
strcpy (message->body + message->bbytes, buffer); strcpy (message->body + message->bbytes, buffer);
message->bbytes += s; message->bbytes += s;
} /* else */ } /* else */
@ -210,14 +201,12 @@ mh_read_message (DIR * dp)
} /* for */ } /* for */
} /* mh_read_message */ } /* mh_read_message */
void void mh_write_message (message_t *m, const char *path)
mh_write_message (message_t * m, const char *path)
{ {
struct dirent *dc; struct dirent *dc;
int x, y = 0; int x, y = 0;
char s1[BUFSIZ]; char s1[BUFSIZ];
DIR *d; DIR *d; FILE *f;
FILE *f;
d = m_opendir (path); d = m_opendir (path);
rewinddir (d); rewinddir (d);

View File

@ -27,18 +27,14 @@
#else #else
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */ #endif /* HAVE_DIRENT_H */
# endif
/* HAVE_DIRENT_H */
#include "mboxgrep.h" #include "mboxgrep.h"

View File

@ -68,8 +68,7 @@ folder_format (const char *name)
return f; return f;
} }
lockmethod_t lockmethod_t lock_method (const char *name)
lock_method (const char *name)
{ {
lockmethod_t l; lockmethod_t l;
@ -123,8 +122,7 @@ time_t parse_date(char *datestr)
} }
*/ */
char * char * parse_return_path(char *rpath)
parse_return_path (char *rpath)
{ {
char *blah1, blah2[BUFSIZ]; char *blah1, blah2[BUFSIZ];
@ -134,8 +132,7 @@ parse_return_path (char *rpath)
return blah1; return blah1;
} }
void * void * allocate_message (void)
allocate_message (void)
{ {
message_t *message; message_t *message;
@ -154,8 +151,7 @@ allocate_message (void)
return message; return message;
} }
void void postmark_print (message_t *msg)
postmark_print (message_t * msg)
{ {
time_t tt; time_t tt;
struct tm *ct; struct tm *ct;

View File

@ -32,7 +32,6 @@ char *parse_return_path (char *rpath);
void * allocate_message (void); void * allocate_message (void);
void postmark_print (message_t *msg); void postmark_print (message_t *msg);
void set_default_options (void); void set_default_options (void);
void get_runtime_options (int *argc, char **argv, void get_runtime_options (int *argc, char **argv, struct option *long_options);
struct option *long_options);
#endif /* MISC_H */ #endif /* MISC_H */

View File

@ -42,7 +42,8 @@ pcre_init (void)
if (config.pcre_pattern == NULL) if (config.pcre_pattern == NULL)
{ {
if (config.merr) if (config.merr)
fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, error); fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s,
error);
exit(2); exit(2);
} }
} }
@ -56,12 +57,14 @@ pcre_match (message_t * msg)
config.res1 = config.res1 =
pcre_exec ((pcre *) config.pcre_pattern, pcre_exec ((pcre *) config.pcre_pattern,
(pcre_extra *) config.pcre_hints, (pcre_extra *) config.pcre_hints,
msg->headers, (int) strlen (msg->headers), 0, 0, of, BUFSIZ); msg->headers,
(int) strlen (msg->headers), 0, 0, of, BUFSIZ);
if (config.body) if (config.body)
config.res2 = config.res2 =
pcre_exec ((pcre *) config.pcre_pattern, pcre_exec ((pcre *) config.pcre_pattern,
(pcre_extra *) config.pcre_hints, (pcre_extra *) config.pcre_hints,
msg->body, (int) strlen (msg->body), 0, 0, of, BUFSIZ); msg->body,
(int) strlen (msg->body), 0, 0, of, BUFSIZ);
config.res1 = config.res1 ^ 1; config.res1 = config.res1 ^ 1;
config.res2 = config.res2 ^ 1; config.res2 = config.res2 ^ 1;
@ -87,8 +90,7 @@ regex_init (void)
{ {
if (config.merr) if (config.merr)
{ {
regerror (errcode, (regex_t *) config.posix_pattern, errbuf, regerror (errcode, (regex_t *) config.posix_pattern, errbuf, BUFSIZ);
BUFSIZ);
fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, errbuf); fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, errbuf);
} }
exit (2); exit (2);

View File

@ -32,16 +32,13 @@
# define NAMLEN(dirent) (dirent)->d_namlen # define NAMLEN(dirent) (dirent)->d_namlen
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */
#endif /* HAVE_DIRENT_H */ #endif /* HAVE_DIRENT_H */
#include <time.h> #include <time.h>
@ -64,16 +61,14 @@
#else #else
# ifdef HAVE_FTW # ifdef HAVE_FTW
# include <ftw.h> # include <ftw.h>
# endif # endif /* HAVE_FTW */
/* HAVE_FTW */
#endif /* HAVE_FTS_OPEN */ #endif /* HAVE_FTS_OPEN */
#ifdef HAVE_LIBDMALLOC #ifdef HAVE_LIBDMALLOC
#include <dmalloc.h> #include <dmalloc.h>
#endif /* HAVE_LIBDMALLOC */ #endif /* HAVE_LIBDMALLOC */
void void scan_mailbox (char path[])
scan_mailbox (char path[])
{ {
static FILE *outf; static FILE *outf;
static mbox_t *mbox, *out; static mbox_t *mbox, *out;
@ -104,19 +99,17 @@ scan_mailbox (char path[])
if (config.action == DELETE) if (config.action == DELETE)
delete = 1; delete = 1;
if ((config.format == MBOX) || (config.format == ZMBOX) if ((config.format == MBOX) || (config.format == ZMBOX) ||
|| (config.format == BZ2MBOX)) (config.format == BZ2MBOX))
{ {
mbox = (mbox_t *) mbox_open (path, "r"); mbox = (mbox_t *) mbox_open (path, "r");
if (mbox == NULL) if (mbox == NULL) return;
return;
} }
else if ((config.format == MH) || (config.format == NNMH) else if ((config.format == MH) || (config.format == NNMH) ||
|| (config.format == NNML)) (config.format == NNML))
{ {
boxd = mh_open (path); boxd = mh_open (path);
if (boxd == NULL) if (boxd == NULL) return;
return;
} }
else if (config.format == MAILDIR) else if (config.format == MAILDIR)
{ {
@ -131,20 +124,18 @@ scan_mailbox (char path[])
config.res1 = 1; config.res1 = 1;
config.res2 = 1; config.res2 = 1;
if ((config.format == MBOX) || (config.format == ZMBOX) if ((config.format == MBOX) || (config.format == ZMBOX) ||
|| (config.format == BZ2MBOX)) (config.format == BZ2MBOX))
msg = (message_t *) mbox_read_message (mbox); msg = (message_t *) mbox_read_message (mbox);
else if ((config.format == MH) || (config.format == NNMH) else if ((config.format == MH) || (config.format == NNMH) ||
|| (config.format == NNML)) (config.format == NNML))
msg = (message_t *) mh_read_message (boxd); msg = (message_t *) mh_read_message (boxd);
else if (config.format == MAILDIR) else if (config.format == MAILDIR)
msg = (message_t *) maildir_read_message (maildird); msg = (message_t *) maildir_read_message (maildird);
if (msg == NULL) if (msg == NULL) break;
break;
if (msg->from == NULL) if (msg->from == NULL) msg->from = (char *) xstrdup ("nobody");
msg->from = (char *) xstrdup ("nobody");
#ifdef HAVE_LIBPCRE #ifdef HAVE_LIBPCRE
if (config.perl) if (config.perl)
@ -173,11 +164,11 @@ scan_mailbox (char path[])
{ {
if (config.format == MAILDIR) if (config.format == MAILDIR)
maildir_write_message (msg, config.outboxname); maildir_write_message (msg, config.outboxname);
else if (config.format == MH || config.format == NNMH else if (config.format == MH || config.format == NNMH ||
|| config.format == NNML) config.format == NNML)
mh_write_message (msg, config.outboxname); mh_write_message (msg, config.outboxname);
else if ((config.format == MBOX) || (config.format == ZMBOX) else if ((config.format == MBOX) || (config.format == ZMBOX) ||
|| (config.format == BZ2MBOX)) (config.format == BZ2MBOX))
{ {
out = mbox_open (config.outboxname, "w"); out = mbox_open (config.outboxname, "w");
/* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */ /* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */
@ -203,16 +194,14 @@ scan_mailbox (char path[])
else if (config.action == COUNT) else if (config.action == COUNT)
runtime.count++; runtime.count++;
else if (config.action == DELETE && else if (config.action == DELETE &&
((config.format == MBOX) || (config.format == ZMBOX) ((config.format == MBOX) || (config.format == ZMBOX) ||
|| (config.format == BZ2MBOX))) (config.format == BZ2MBOX)))
mbox_write_message (msg, runtime.tmp_mbox); mbox_write_message (msg, runtime.tmp_mbox);
} }
else else if (((((config.res1 == 0) | (config.res2 == 0)) ^ config.invert) && delete) &&
if (((((config.res1 == 0) | (config.res2 == 0)) ^ config.invert) ((config.format == MH) || (config.format == NNMH) ||
&& delete) && ((config.format == MH) || (config.format == NNMH) (config.format == NNML) || (config.format == MAILDIR)))
|| (config.format == NNML)
|| (config.format == MAILDIR)))
m_unlink(msg->filename); m_unlink(msg->filename);
free(msg->body); free(msg->body);
@ -220,16 +209,15 @@ scan_mailbox (char path[])
free(msg); free(msg);
} /* for */ } /* for */
if ((config.format == MBOX) || (config.format == ZMBOX) if ((config.format == MBOX) || (config.format == ZMBOX) ||
|| (config.format == BZ2MBOX)) (config.format == BZ2MBOX))
mbox_close (mbox); mbox_close (mbox);
else if ((config.format == MH) || (config.format == NNMH) else if ((config.format == MH) || (config.format == NNMH) ||
|| (config.format == NNML)) (config.format == NNML))
mh_close(boxd); mh_close(boxd);
} }
void void recursive_scan (char path[])
recursive_scan (char path[])
{ {
#ifdef HAVE_FTS_OPEN #ifdef HAVE_FTS_OPEN
FTS *ftsfoo; FTS *ftsfoo;
@ -262,8 +250,7 @@ recursive_scan (char path[])
#endif /* HAVE_FTS_OPEN */ #endif /* HAVE_FTS_OPEN */
} }
int int md5_check_message (char *body, checksum_t *chksum)
md5_check_message (char *body, checksum_t * chksum)
{ {
struct md5_ctx a; struct md5_ctx a;
char b[16]; char b[16];
@ -284,8 +271,7 @@ md5_check_message (char *body, checksum_t * chksum)
return 1; return 1;
} }
chksum->md5 = chksum->md5 = (char **) xrealloc (chksum->md5, (1 + chksum->n) * sizeof (char *));
(char **) xrealloc (chksum->md5, (1 + chksum->n) * sizeof (char *));
chksum->md5[chksum->n] = xstrdup (b); chksum->md5[chksum->n] = xstrdup (b);

View File

@ -31,16 +31,13 @@
# define NAMLEN(dirent) (dirent)->d_namlen # define NAMLEN(dirent) (dirent)->d_namlen
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */
#endif /* HAVE_DIRENT_H */ #endif /* HAVE_DIRENT_H */
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
#include <zlib.h> #include <zlib.h>
@ -62,8 +59,7 @@
#define BUFLEN 16384 #define BUFLEN 16384
int int m_open (const char *pathname, int flags, mode_t mode)
m_open (const char *pathname, int flags, mode_t mode)
{ {
int blah; int blah;
@ -82,8 +78,7 @@ m_open (const char *pathname, int flags, mode_t mode)
return blah; return blah;
} }
FILE * FILE *m_fopen (const char *path, const char *mode)
m_fopen (const char *path, const char *mode)
{ {
FILE *blah; FILE *blah;
@ -101,8 +96,7 @@ m_fopen (const char *path, const char *mode)
return blah; return blah;
} }
FILE * FILE *m_fdopen (int fildes, const char *mode)
m_fdopen (int fildes, const char *mode)
{ {
FILE *blah; FILE *blah;
@ -117,8 +111,7 @@ m_fdopen (int fildes, const char *mode)
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
gzFile gzFile m_gzdopen (int fildes, const char *mode)
m_gzdopen (int fildes, const char *mode)
{ {
gzFile blah; gzFile blah;
@ -133,8 +126,7 @@ m_gzdopen (int fildes, const char *mode)
#endif /* HAVE_LIBZ */ #endif /* HAVE_LIBZ */
DIR * DIR *m_opendir (const char *name)
m_opendir (const char *name)
{ {
DIR *blah; DIR *blah;
@ -152,8 +144,7 @@ m_opendir (const char *name)
#ifndef HAVE_LIBDMALLOC #ifndef HAVE_LIBDMALLOC
void * void *xmalloc (size_t size)
xmalloc (size_t size)
{ {
void *foo; void *foo;
@ -167,8 +158,7 @@ xmalloc (size_t size)
return foo; return foo;
} }
void * void *xrealloc (void *ptr, size_t size)
xrealloc (void *ptr, size_t size)
{ {
void *foo; void *foo;
@ -182,8 +172,7 @@ xrealloc (void *ptr, size_t size)
return foo; return foo;
} }
void * void *xcalloc (size_t nmemb, size_t size)
xcalloc (size_t nmemb, size_t size)
{ {
void *foo; void *foo;
@ -197,8 +186,7 @@ xcalloc (size_t nmemb, size_t size)
return foo; return foo;
} }
char * char *xstrdup (const char *s)
xstrdup (const char *s)
{ {
char *foo; char *foo;
@ -214,8 +202,7 @@ xstrdup (const char *s)
#endif /* HAVE_LIBDMALLOC */ #endif /* HAVE_LIBDMALLOC */
int int m_unlink (const char *pathname)
m_unlink (const char *pathname)
{ {
int baz; int baz;
@ -233,8 +220,7 @@ m_unlink (const char *pathname)
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
void void gzwrite_loop (void *fp, char *str)
gzwrite_loop (void *fp, char *str)
{ {
int quux, len, baz; int quux, len, baz;
@ -254,8 +240,7 @@ gzwrite_loop (void *fp, char *str)
#ifdef HAVE_LIBBZ2 #ifdef HAVE_LIBBZ2
void void bzwrite_loop (void *fp, char *str)
bzwrite_loop (void *fp, char *str)
{ {
int quux, len, baz; int quux, len, baz;

View File

@ -33,29 +33,23 @@
#else #else
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h> # include <sys/ndir.h>
# endif # endif /* HAVE_SYS_NDIR_H */
/* HAVE_SYS_NDIR_H */
# ifdef HAVE_SYS_DIR_H # ifdef HAVE_SYS_DIR_H
# include <sys/dir.h> # include <sys/dir.h>
# endif # endif /* HAVE_SYS_DIR_H */
/* HAVE_SYS_DIR_H */
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif /* HAVE_NDIR_H */
/* HAVE_NDIR_H */ #endif /* HAVE_DIRENT_H */
# endif
/* HAVE_DIRENT_H */
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
#include <zlib.h> #include <zlib.h>
# endif #endif /* HAVE_LIBZ */
/* HAVE_LIBZ */
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_LIBDMALLOC #ifdef HAVE_LIBDMALLOC
# include <dmalloc.h> # include <dmalloc.h>
# endif #endif /* HAVE_LIBDMALLOC */
/* HAVE_LIBDMALLOC */
int m_open (const char *pathname, int flags, mode_t mode); int m_open (const char *pathname, int flags, mode_t mode);
@ -64,12 +58,10 @@ FILE *m_fdopen (int fildes, const char *mode);
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
gzFile m_gzdopen (int fildes, const char *mode); gzFile m_gzdopen (int fildes, const char *mode);
void gzwrite_loop (void *fp, char *str); void gzwrite_loop (void *fp, char *str);
# endif #endif /* HAVE_LIBZ */
/* HAVE_LIBZ */
#ifdef HAVE_LIBBZ2 #ifdef HAVE_LIBBZ2
void bzwrite_loop (void *fp, char *str); void bzwrite_loop (void *fp, char *str);
# endif #endif /* HAVE_LIBBZ2 */
/* HAVE_LIBBZ2 */
DIR *m_opendir (const char *name); DIR *m_opendir (const char *name);
@ -78,8 +70,7 @@ void *xmalloc (size_t size);
void *xrealloc (void *ptr, size_t size); void *xrealloc (void *ptr, size_t size);
void *xcalloc (size_t nmemb, size_t size); void *xcalloc (size_t nmemb, size_t size);
char *xstrdup (const char *s); char *xstrdup (const char *s);
# endif #endif /* HAVE_LIBDMALLOC */
/* HAVE_LIBDMALLOC */
int m_unlink (const char *pathname); int m_unlink (const char *pathname);