X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffmt_new.c;h=4acabe796b991bf316e320d81b3a1a13224bd44f;hp=44a18b3772e97de05b12a4ca933dbb7f3b029b4d;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c index 44a18b3..4acabe7 100644 --- a/sbr/fmt_new.c +++ b/sbr/fmt_new.c @@ -1,4 +1,3 @@ - /* * fmt_new.c -- read format file/string and normalize * @@ -27,34 +26,34 @@ static void normalize (char *); char * new_fs (char *form, char *format, char *default_fs) { - struct stat st; - register FILE *fp; + struct stat st; + register FILE *fp; - if (formats) - free (formats); + if (formats) + free (formats); - if (form) { - if ((fp = fopen (etcpath (form), "r")) == NULL) - adios (form, "unable to open format file"); + if (form) { + if ((fp = fopen (etcpath (form), "r")) == NULL) + adios (form, "unable to open format file"); - if (fstat (fileno (fp), &st) == -1) - adios (form, "unable to stat format file"); + if (fstat (fileno (fp), &st) == -1) + adios (form, "unable to stat format file"); - formats = mh_xmalloc ((size_t) st.st_size + 1); + 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"); + if (read (fileno(fp), formats, (int) st.st_size) != st.st_size) + adios (form, "error reading format file"); - formats[st.st_size] = '\0'; + formats[st.st_size] = '\0'; - fclose (fp); - } else { - formats = getcpy (format ? format : default_fs); - } + fclose (fp); + } else { + formats = getcpy (format ? format : default_fs); + } - normalize (formats); /* expand escapes */ + normalize (formats); /* expand escapes */ - return formats; + return formats; } @@ -65,43 +64,43 @@ new_fs (char *form, char *format, char *default_fs) static void normalize (char *cp) { - char *dp; - - for (dp = cp; *cp; cp++) { - if (*cp != QUOTE) { - *dp++ = *cp; - } else { - switch (*++cp) { - case 'b': - *dp++ = '\b'; - break; - - case 'f': - *dp++ = '\f'; - break; - - case 'n': - *dp++ = '\n'; - break; - - case 'r': - *dp++ = '\r'; - break; - - case 't': - *dp++ = '\t'; - break; - - case '\n': - break; - - case 0: - cp--; /* fall */ - default: - *dp++ = *cp; - break; - } + char *dp; + + for (dp = cp; *cp; cp++) { + if (*cp != QUOTE) { + *dp++ = *cp; + } else { + switch (*++cp) { + case 'b': + *dp++ = '\b'; + break; + + case 'f': + *dp++ = '\f'; + break; + + case 'n': + *dp++ = '\n'; + break; + + case 'r': + *dp++ = '\r'; + break; + + case 't': + *dp++ = '\t'; + break; + + case '\n': + break; + + case 0: + cp--; /* fall */ + default: + *dp++ = *cp; + break; + } + } } - } - *dp = '\0'; + *dp = '\0'; }