left: take a C99 bool in 'buildpath' instead of an int

diff --git a/cmd/lefty/aix_mods/common.h b/cmd/lefty/aix_mods/common.h
index 250e82f6ab6f6d9fc3d3d10e934fc530a4c392e8..35fd5992b7b191a0d6a85087dc02bf7f1a014732 100644 (file)
--- a/cmd/lefty/aix_mods/common.h
+++ b/cmd/lefty/aix_mods/common.h
@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 #endif
 
+#include <stdbool.h>
 #include <sys/select.h>
 #include <math.h>
 #include <stdio.h>
@@ -57,7 +58,7 @@
 
     int init(char *);
     void term(void);
-    char *buildpath(char *, int);
+    char *buildpath(char *, bool);
     char *buildcommand(char *, char *, int, int, char *);
     void warning(char *, int, char *, char *, ...);
 

diff --git a/cmd/lefty/common.c b/cmd/lefty/common.c
index 754c4addac866fa18680c3c13689e0b29ae3c682..13c99b5212e8eb2c8e17a641f72e9f9b15e7d2de 100644 (file)
--- a/cmd/lefty/common.c
+++ b/cmd/lefty/common.c
@@ -99,7 +99,7 @@ int init (char *aout) {
 #else
     if (!strchr (aout, PATHDEL)) {
         leftypath = "";
-        if ((s1 = buildpath (aout, TRUE)))
+        if ((s1 = buildpath (aout, true)))
             aout = strdup (s1);
     } else
         aout = strdup (aout);
@@ -156,13 +156,13 @@ void term (void) {
 
     returns the first occurance of that file or NULL
 */
-char *buildpath (char *file, int flag) {
+char *buildpath (char *file, bool flag) {
     struct stat statbuf;
     char *s1, *s2;
     int mode, pathi, i;
 
 #ifdef FEATURE_NETSCAPE
-    if (flag == FALSE && innetscape) {
+    if (!flag && innetscape) {
 #ifdef FEATURE_WIN32
         HWND hwnd;
         char *s;

diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h
index 53c86fc092eb8c0b047ee423bd983848f0829d79..c15e9573529c734d535d06f7d1634bf58a7af319 100644 (file)
--- a/cmd/lefty/common.h
+++ b/cmd/lefty/common.h
@@ -32,6 +32,7 @@
 #define FEATURE_X11 1
 #endif
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
@@ -87,7 +88,7 @@ extern fd_set inputfds;
 
 int init (char *);
 void term (void);
-char *buildpath (char *, int);
+char *buildpath (char *, bool);
 char *buildcommand (char *, char *, int, int, char *);
 void warning (char *, int, char *, char *, ...);
 

diff --git a/cmd/lefty/internal.c b/cmd/lefty/internal.c
index 00cd27b1107f7c0dc0e8b0bd863d5641282fd292..91410aa12c2d773e7b062acb8bbb08f2a1de7b45 100644 (file)
--- a/cmd/lefty/internal.c
+++ b/cmd/lefty/internal.c
@@ -28,6 +28,7 @@
 #include "gmap2l.h"
 #endif
 #include "internal.h"
+#include <stdbool.h>
 #include <string.h>
 #ifndef FEATURE_MS
 #include <sys/time.h>
@@ -621,7 +622,7 @@ int Iload (int argc, lvar_t *argv) {
             fp = stdin;
         else {
             fp = NULL;
-            if ((fn = buildpath (fn, FALSE)))
+            if ((fn = buildpath (fn, false)))
                 fp = fopen (fn, "r");
         }
         if (fp) {

diff --git a/cmd/lefty/os/mswin32/io.c b/cmd/lefty/os/mswin32/io.c
index 399514ec26e5f6a1de02fd7c88d2ad62726a9e17..b8391153e9d562bd2e768248a5d684894610c95d 100644 (file)
--- a/cmd/lefty/os/mswin32/io.c
+++ b/cmd/lefty/os/mswin32/io.c
@@ -14,6 +14,7 @@
 #include "g.h"
 #include "leftyio.h"
 #include "mem.h"
+#include <stdbool.h>
 
 io_t *iop;
 int ion;
@@ -79,7 +80,7 @@ int IOopen (char *kind, char *name, char *mode, char *fmt) {
     switch (type) {
     case IO_FILE:
         if (!(p->ifp = p->ofp = fopen (name, mode))) {
-            path = buildpath (name, FALSE);
+            path = buildpath (name, false);
             if (!path || !(p->ifp = p->ofp = fopen (path, mode)))
                 return -1;
         }
@@ -88,7 +89,7 @@ int IOopen (char *kind, char *name, char *mode, char *fmt) {
         if (!fmt)
             fmt = "%e";
         if (
-            !(path = buildpath (name, TRUE)) ||
+            !(path = buildpath (name, true)) ||
             !(command = buildcommand (path, NULL, -1, -1, fmt))
         )
             return -1;

diff --git a/cmd/lefty/os/unix/io.c b/cmd/lefty/os/unix/io.c
index adca07e34fce3b3a0fd863364384391040cd0c1d..afd3bbd8403ed804377720aeb849aa601c0b9a83 100644 (file)
--- a/cmd/lefty/os/unix/io.c
+++ b/cmd/lefty/os/unix/io.c
@@ -18,6 +18,7 @@
 #include "mem.h"
 #include <fcntl.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <string.h>
 #include <sys/wait.h>
 #ifndef HAVE_TERMIOS_H
@@ -80,7 +81,7 @@ void IOinit (void) {
     if (!(shell = getenv ("SHELL")))
         shell = "/bin/sh";
     if (shell[0] != '/' && shell[0] != '.') {
-        if (!(shell = buildpath (shell, TRUE)))
+        if (!(shell = buildpath (shell, true)))
             shell = "/bin/sh";
         else
             shell = strdup (shell);
@@ -170,7 +171,7 @@ int IOopen (char *kind, char *name, char *mode, char *fmt) {
                     return -1;
                 break;
             }
-            path = buildpath (name, FALSE);
+            path = buildpath (name, false);
             if (!path || !(p->ifp = p->ofp = fopen (path, mode)))
                 return -1;
         }
@@ -179,7 +180,7 @@ int IOopen (char *kind, char *name, char *mode, char *fmt) {
         if (!fmt)
             fmt = "%e";
         if (
-            !(path = buildpath (name, TRUE)) ||
+            !(path = buildpath (name, true)) ||
             !(command = buildcommand (path, NULL, -1, -1, fmt))
         )
             return -1;
@@ -191,7 +192,7 @@ int IOopen (char *kind, char *name, char *mode, char *fmt) {
         if (!fmt)
             fmt = "%e";
         if (
-            !(path = buildpath (name, TRUE)) ||
+            !(path = buildpath (name, true)) ||
             !(command = buildcommand (path, NULL, -1, -1, fmt))
         )
             return -1;
@@ -216,7 +217,7 @@ int IOopen (char *kind, char *name, char *mode, char *fmt) {
         if (listen (sfd, 5) < 0)
             return -1;
         gethostname (hname, sizeof (hname));
-        if (!(path = buildpath (name, TRUE)) || !(command = buildcommand (
+        if (!(path = buildpath (name, true)) || !(command = buildcommand (
             path, hname, (int) ntohs (sname.sin_port),
             (int) ntohs (sname.sin_port), fmt
         )))

diff --git a/cmd/lefty/ws/x11/gpcanvas.c b/cmd/lefty/ws/x11/gpcanvas.c
index a314b2ce2cf1b0368b7f40c71b92af3e03fccdd5..4df9b844aeb8aeb2cc8fdd58281635e0a9c95d1e 100644 (file)
--- a/cmd/lefty/ws/x11/gpcanvas.c
+++ b/cmd/lefty/ws/x11/gpcanvas.c
@@ -15,6 +15,7 @@
 #include "gcommon.h"
 #include "mem.h"
 #include <math.h>
+#include <stdbool.h>
 #include <string.h>
 
 #define PSDPI 300.0
@@ -67,7 +68,7 @@ int GPcreatewidget (
     int color, lflag, ai, i, x, y, w, h, r, g, b;
 
     if (
-        !(path = buildpath ("lefty.psp", 0)) ||
+        !(path = buildpath ("lefty.psp", false)) ||
         !(pfp = fopen (path, "r"))
     ) {
         Gerr (POS, G_ERRCANNOTOPENFILE, "lefty.psp");