X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_new.c;h=9a7988ebb07993aa2c3a1a027dcfca4adf49a12f;hb=c84cfab8f077f7e1929de69ba82587d999f769d9;hp=9fd34c8e1b4350782be1164cbb544ab81469f4fb;hpb=f51956be123db66b00138f80464d06f030dbb88d;p=mmh diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c index 9fd34c8..9a7988e 100644 --- a/sbr/fmt_new.c +++ b/sbr/fmt_new.c @@ -8,6 +8,9 @@ #include #include +#include +#include +#include static char *formats = NULL; @@ -24,7 +27,7 @@ char * new_fs(char *form, char *def_form) { struct stat st; - register FILE *fp; + FILE *fp; if (formats) { free(formats); @@ -35,14 +38,14 @@ new_fs(char *form, char *def_form) formats = getcpy(form+1); } else { if ((fp = fopen(etcpath(form), "r")) == NULL) { - adios(form, "unable to open format file"); + adios(EX_IOERR, form, "unable to open format file"); } if (fstat(fileno(fp), &st) == -1) { - adios(form, "unable to stat format file"); + adios(EX_IOERR, form, "unable to stat format file"); } formats = mh_xmalloc((size_t) st.st_size + 1); if (read(fileno(fp), formats, (int)st.st_size) != st.st_size) { - adios(form, "error reading format file"); + adios(EX_IOERR, form, "error reading format file"); } formats[st.st_size] = '\0'; fclose(fp); @@ -52,14 +55,14 @@ new_fs(char *form, char *def_form) formats = getcpy(def_form+1); } else { if ((fp = fopen(etcpath(def_form), "r")) == NULL) { - adios(def_form, "unable to open format file"); + adios(EX_IOERR, def_form, "unable to open format file"); } if (fstat(fileno(fp), &st) == -1) { - adios(def_form, "unable to stat format file"); + adios(EX_IOERR, def_form, "unable to stat format file"); } formats = mh_xmalloc((size_t) st.st_size + 1); if (read(fileno(fp), formats, (int)st.st_size) != st.st_size) { - adios(def_form, "error reading format file"); + adios(EX_IOERR, def_form, "error reading format file"); } formats[st.st_size] = '\0'; fclose(fp);