X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..aad7213c7ebca96dff5f141e0e26a165eba4e6b8:/sbr/vfgets.c

diff --git a/sbr/vfgets.c b/sbr/vfgets.c
index 39cfaa27..480af139 100644
--- a/sbr/vfgets.c
+++ b/sbr/vfgets.c
@@ -1,8 +1,4 @@
-
-/*
- * vfgets.c -- virtual fgets
- *
- * $Id$
+/* vfgets.c -- virtual fgets
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 #define	QUOTE	'\\'
 
@@ -23,8 +20,7 @@ vfgets (FILE *in, char **bp)
     static char *pp = NULL;
 
     if (pp == NULL)
-	if (!(pp = malloc ((size_t) (len = BUFSIZ))))
-	    adios (NULL, "unable to allocate string storage");
+	pp = mh_xmalloc ((size_t) (len = BUFSIZ));
 
     for (ep = (cp = pp) + len - 1;;) {
 	if (fgets (cp, ep - cp + 1, in) == NULL) {
@@ -42,15 +38,13 @@ wrong_guess:
 	    if (*dp == '\n') {
 		*bp = pp;
 		return 0;
-	    } else {
-		cp = ++dp;
 	    }
+            cp = ++dp;
 	} else {
 	    for (fp = dp - 1, toggle = 0; fp >= cp; fp--) {
 		if (*fp != QUOTE)
 		    break;
-		else
-		    toggle = !toggle;
+                toggle = !toggle;
 	    }
 	    if (toggle)
 		goto wrong_guess;
@@ -66,12 +60,9 @@ wrong_guess:
 	if (cp >= ep) {
 	    int curlen = cp - pp;
 
-	    if (!(dp = realloc (pp, (size_t) (len += BUFSIZ)))) {
-		adios (NULL, "unable to allocate string storage");
-	    } else {
-		cp = dp + curlen;
-		ep = (pp = dp) + len - 1;
-	    }
+	    dp = mh_xrealloc (pp, (size_t) (len += BUFSIZ));
+	    cp = dp + curlen;
+	    ep = (pp = dp) + len - 1;
 	}
     }
 }