Coerce pid_t to long rather than int for better portability.

Suggested by: Theo de Raadt <deraadt@openbsd.org>

4 files changed, 17 insertions, 17 deletions

diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index bbec25d..5a8536c 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -1615,8 +1615,8 @@ bundle_SendDatalink(struct datalink *dl, int s, struct sockaddr_un *sun)
       int res;
 
       if ((got = read(reply[0], &newpid, sizeof newpid)) == sizeof newpid) {
-        log_Printf(LogDEBUG, "Received confirmation from pid %d\n",
-                   (int)newpid);
+        log_Printf(LogDEBUG, "Received confirmation from pid %ld\n",
+                   (long)newpid);
         if (lock && (res = ID0uu_lock_txfr(lock, newpid)) != UU_LOCK_OK)
             log_Printf(LogERROR, "uu_lock_txfr: %s\n", uu_lockerr(res));
 
@@ -1756,8 +1756,8 @@ bundle_setsid(struct bundle *bundle, int holdsession)
           close(fds[0]);
           setsid();
           bundle_ChangedPID(bundle);
-          log_Printf(LogDEBUG, "%d -> %d: %s session control\n",
-                     (int)orig, (int)getpid(),
+          log_Printf(LogDEBUG, "%ld -> %ld: %s session control\n",
+                     (long)orig, (long)getpid(),
                      holdsession ? "Passed" : "Dropped");
           timer_InitService(0);		/* Start the Timer Service */
           break;
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 4f297e3..2800113 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -464,11 +464,11 @@ substip(char *tgt, const char *oldstr, struct in_addr ip)
 }
 
 static char *
-substint(char *tgt, const char *oldstr, int i)
+substlong(char *tgt, const char *oldstr, long l)
 {
-  char buf[12];
+  char buf[23];
 
-  snprintf(buf, sizeof buf, "%d", i);
+  snprintf(buf, sizeof buf, "%ld", l);
 
   return subst(tgt, oldstr, buf);
 }
@@ -567,9 +567,9 @@ command_Expand(char **nargv, int argc, char const *const *oargv,
                        mp_Enddisc(bundle->ncp.mp.peer.enddisc.class,
                                   bundle->ncp.mp.peer.enddisc.address,
                                   bundle->ncp.mp.peer.enddisc.len));
-    nargv[arg] = substint(nargv[arg], "PROCESSID", pid);
+    nargv[arg] = substlong(nargv[arg], "PROCESSID", pid);
     if (server.cfg.port)
-      nargv[arg] = substint(nargv[arg], "SOCKNAME", server.cfg.port);
+      nargv[arg] = substlong(nargv[arg], "SOCKNAME", server.cfg.port);
     else
       nargv[arg] = subst(nargv[arg], "SOCKNAME", server.cfg.sockname);
     nargv[arg] = subst(nargv[arg], "UPTIME", uptime);
@@ -659,7 +659,7 @@ ShellCommand(struct cmdargs const *arg, int bg)
 
 	p = getpid();
 	if (daemon(1, 1) == -1) {
-	  log_Printf(LogERROR, "%d: daemon: %s\n", (int)p, strerror(errno));
+	  log_Printf(LogERROR, "%ld: daemon: %s\n", (long)p, strerror(errno));
 	  exit(1);
 	}
       } else if (arg->prompt)
@@ -678,7 +678,7 @@ ShellCommand(struct cmdargs const *arg, int bg)
     _exit(255);
   }
 
-  if (shpid == (pid_t) - 1)
+  if (shpid == (pid_t)-1)
     log_Printf(LogERROR, "Fork failed: %s\n", strerror(errno));
   else {
     int status;
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 15676db..97a680e 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -183,8 +183,8 @@ ID0uu_lock_txfr(const char *basettyname, pid_t newpid)
 
   ID0set0();
   ret = uu_lock_txfr(basettyname, newpid);
-  log_Printf(LogID0, "%d = uu_lock_txfr(\"%s\", %d)\n", ret, basettyname,
-             (int)newpid);
+  log_Printf(LogID0, "%d = uu_lock_txfr(\"%s\", %ld)\n", ret, basettyname,
+             (long)newpid);
   ID0setuser();
   return ret;
 }
@@ -268,7 +268,7 @@ ID0kill(pid_t pid, int sig)
 
   ID0set0();
   result = kill(pid, sig);
-  log_Printf(LogID0, "%d = kill(%d, %d)\n", result, (int)pid, sig);
+  log_Printf(LogID0, "%d = kill(%ld, %d)\n", result, (long)pid, sig);
   ID0setuser();
   return result;
 }
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index 476fc84..073ee57 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -365,8 +365,8 @@ physical_Close(struct physical *p)
   throughput_log(&p->link.stats.total, LogPHASE, p->link.name);
 
   if (p->session_owner != (pid_t)-1) {
-    log_Printf(LogPHASE, "%s: HUPing %d\n", p->link.name,
-               (int)p->session_owner);
+    log_Printf(LogPHASE, "%s: HUPing %ld\n", p->link.name,
+               (long)p->session_owner);
     ID0kill(p->session_owner, SIGHUP);
     p->session_owner = (pid_t)-1;
   }
@@ -456,7 +456,7 @@ physical_ShowStatus(struct cmdargs const *arg)
                 *p->name.full ?  p->name.full :
                 p->type == PHYS_DIRECT ? "unknown" : "N/A");
   if (p->session_owner != (pid_t)-1)
-    prompt_Printf(arg->prompt, " (session owner: %d)", (int)p->session_owner);
+    prompt_Printf(arg->prompt, " (session owner: %ld)", (long)p->session_owner);
 
   prompt_Printf(arg->prompt, "\n Link Type:       %s\n", mode2Nam(p->type));
   prompt_Printf(arg->prompt, " Connect Count:   %d\n", p->connect_count);