Revert part of the previous diff to fix a regression (another endless loop)

[mandoc.git] / soelim.c

diff --git a/soelim.c b/soelim.c
index c1fa4adb6e744c58be2a7aed21f267962c14f82e..33d60e4588266a42a0809aa64b626dbb3ca912f6 100644 (file)
--- a/soelim.c
+++ b/soelim.c
@@ -1,4 +1,4 @@
-/*     $Id: soelim.c,v 1.2 2015/05/20 22:22:59 schwarze Exp $  */
+/*     $Id: soelim.c,v 1.6 2021/09/19 18:14:24 schwarze Exp $  */
 /*
  * Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
  * All rights reserved.
@@ -24,12 +24,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "config.h"
 
-#include <sys/param.h>
 #include <sys/types.h>
 
 #include <ctype.h>
+#if HAVE_ERR
 #include <err.h>
+#endif
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -57,7 +60,7 @@ static FILE *
 soelim_fopen(const char *name)
 {
        FILE *f;
-       char path[MAXPATHLEN];
+       char path[PATH_MAX];
        size_t i;
 
        if (strcmp(name, "-") == 0)
@@ -101,16 +104,16 @@ soelim_file(FILE *f, int flag)
                }
 
                walk = line + 3;
-               if (!isspace(*walk) && ((flag & C_OPTION) == 0)) {
+               if (!isspace((unsigned char)*walk) && (flag & C_OPTION) == 0) {
                        printf("%s", line);
                        continue;
                }
 
-               while (isspace(*walk))
+               while (isspace((unsigned char)*walk))
                        walk++;
 
                cp = walk;
-               while (*cp != '\0' && !isspace(*cp))
+               while (*cp != '\0' && !isspace((unsigned char)*cp))
                        cp++;
                *cp = 0;
                if (cp < line + linelen)