58 lines
1.5 KiB
Text
58 lines
1.5 KiB
Text
$NetBSD: patch-ad,v 1.3 2005/11/10 16:30:04 joerg Exp $
|
|
|
|
--- tcx.c.orig 1993-12-27 03:25:17.000000000 +0000
|
|
+++ tcx.c
|
|
@@ -17,11 +17,8 @@
|
|
/* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
/************************************************************************/
|
|
|
|
-
|
|
#include "config.h"
|
|
|
|
-extern int errno;
|
|
-
|
|
int main(int, char *[]);
|
|
int is_tcx(int);
|
|
int doencode(int, int);
|
|
@@ -120,16 +117,16 @@ int islocal;
|
|
/* If cannot, warn user and quit */
|
|
|
|
if(strrchr(argv[1], '/') == NULL)
|
|
- (void)sprintf(tofile, ".tcx.%s", argv[1]);
|
|
+ (void)snprintf(tofile, sizeof(tofile), ".tcx.%s", argv[1]);
|
|
else
|
|
{
|
|
- (void)strcpy(tofile, argv[1]);
|
|
+ (void)strlcpy(tofile, argv[1], sizeof(tofile));
|
|
s = strrchr(tofile, '/');
|
|
*s = '\0';
|
|
- (void)strcat(tofile, "/.tcx.");
|
|
+ (void)strlcat(tofile, "/.tcx.", sizeof(tofile));
|
|
s = strrchr(argv[1], '/');
|
|
s++;
|
|
- (void)strcat(tofile, s);
|
|
+ (void)strlcat(tofile, s, sizeof(tofile));
|
|
}
|
|
|
|
lck.l_type = F_WRLCK; lck.l_whence = 0; lck.l_start = 0; lck.l_len = 0;
|
|
@@ -213,7 +210,7 @@ int islocal;
|
|
|
|
/* Spit out header and start encoding executable */
|
|
|
|
- (void)sprintf(header, "#!%s\n", PATHUNTCX);
|
|
+ (void)snprintf(header, sizeof(header), "#!%s\n", PATHUNTCX);
|
|
if(write(outfd, header, strlen(header)) < 0) { (void)perror("write"); exit(-1); }
|
|
|
|
c = 0; if((write(outfd, &c, 1)) < 0) { (void)perror("write"); exit(-1); }
|
|
@@ -291,7 +288,11 @@ int
|
|
doencode(int infd, int outfd)
|
|
{
|
|
int pid;
|
|
+#if defined(sun)
|
|
+int status;
|
|
+#else
|
|
union wait status;
|
|
+#endif
|
|
|
|
pid = fork();
|
|
if(pid < 0) return -1;
|