shithub: riscv

Download patch

ref: c76243e7e59ffdbcc1a7785f2ca6237128569919
parent: 492958f08e2e9573679973cdd8119b95a57f8889
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Wed Feb 5 14:25:24 EST 2014

fix wrong type for terminating nil argument for execl()

we have to use (void*)0 instead of (int)0 otherwise the
upper bits are uninitialized on amd64.

--- a/sys/src/cmd/abaco/util.c
+++ b/sys/src/cmd/abaco/util.c
@@ -676,7 +676,7 @@
 	}
 	if(!procstderr)
 		close(2);
-	procexecl(e->sync, "/bin/rc", "rc", "-c", e->cmd, 0);
+	procexecl(e->sync, "/bin/rc", "rc", "-c", e->cmd, nil);
 	error("can't exec");
 }
 
--- a/sys/src/cmd/audio/flacdec/flacdec.c
+++ b/sys/src/cmd/audio/flacdec/flacdec.c
@@ -55,7 +55,7 @@
 			dup2(pfd[1], 0);
 			close(pfd[1]);
 			close(pfd[0]);
-			execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, 0);
+			execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, nil);
 			fprintf(stderr, "Error executing converter\n");
 			exit(1);
 		}
--- a/sys/src/cmd/audio/mp3dec/main.c
+++ b/sys/src/cmd/audio/mp3dec/main.c
@@ -61,7 +61,7 @@
 			dup(pfd[1], 0);
 			close(pfd[1]);
 			close(pfd[0]);
-			execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, 0);
+			execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, nil);
 			sysfatal("exec: %r");
 		}
 		close(pfd[1]);
--- a/sys/src/cmd/audio/oggdec/oggdec.c
+++ b/sys/src/cmd/audio/oggdec/oggdec.c
@@ -61,7 +61,7 @@
 			dup2(pfd[1], 0);
 			close(pfd[1]);
 			close(pfd[0]);
-			execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, 0);
+			execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, nil);
 			fprintf(stderr, "Error executing converter\n");
 			exit(1);
 		}
--- a/sys/src/cmd/audio/sundec/sundec.c
+++ b/sys/src/cmd/audio/sundec/sundec.c
@@ -56,7 +56,7 @@
 	}
 	if(len > 0){
 		snprint(buf, sizeof(buf), "%lud", len);
-		execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, "-l", buf, 0);
+		execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, "-l", buf, nil);
 	} else
-		execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, 0);
+		execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, nil);
 }
--- a/sys/src/cmd/audio/wavdec/wavdec.c
+++ b/sys/src/cmd/audio/wavdec/wavdec.c
@@ -97,5 +97,5 @@
 		sysfatal("wave format (0x%lux) not supported", (ulong)wav.fmt);
 	}
 	snprint(buf, sizeof(buf), "%lud", len);
-	execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, "-l", buf, 0);
+	execl("/bin/audio/pcmconv", "pcmconv", "-i", fmt, "-l", buf, nil);
 }
--- a/sys/src/cmd/mothra/mothra.c
+++ b/sys/src/cmd/mothra/mothra.c
@@ -809,7 +809,7 @@
 		break;
 	case 0:
 		dupfds(fd, 1, 2, -1);
-		execl("/bin/rc", "rc", "-c", cmd, 0);
+		execl("/bin/rc", "rc", "-c", cmd, nil);
 		_exits(0);
 	}
 	close(fd);
--- a/sys/src/cmd/vnc/wsys.c
+++ b/sys/src/cmd/vnc/wsys.c
@@ -195,8 +195,8 @@
 		}
 		close(pfd[0]);
 		close(pfd[1]);
-		execl("/bin/tcs", "tcs", fd0 < 0 ? "-f" : "-t", charset, 0);
-		execl("/bin/cat", "cat", 0);
+		execl("/bin/tcs", "tcs", fd0 < 0 ? "-f" : "-t", charset, nil);
+		execl("/bin/cat", "cat", nil);
 		_exits(0);
 	}
 	close(pfd[0]);