=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/common.c,v retrieving revision 1.14 retrieving revision 1.15 diff -c -r1.14 -r1.15 *** src/usr.bin/rdist/common.c 2002/05/27 03:14:22 1.14 --- src/usr.bin/rdist/common.c 2002/06/12 06:07:16 1.15 *************** *** 1,4 **** ! /* $OpenBSD: common.c,v 1.14 2002/05/27 03:14:22 deraadt Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. --- 1,4 ---- ! /* $OpenBSD: common.c,v 1.15 2002/06/12 06:07:16 mpech Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. *************** *** 39,45 **** "$From: common.c,v 6.82 1998/03/23 23:27:33 michaelc Exp $"; #else static char RCSid[] = ! "$OpenBSD: common.c,v 1.14 2002/05/27 03:14:22 deraadt Exp $"; #endif static char sccsid[] = "@(#)common.c"; --- 39,45 ---- "$From: common.c,v 6.82 1998/03/23 23:27:33 michaelc Exp $"; #else static char RCSid[] = ! "$OpenBSD: common.c,v 1.15 2002/06/12 06:07:16 mpech Exp $"; #endif static char sccsid[] = "@(#)common.c"; *************** *** 238,245 **** */ extern void coredump() { ! error("Segmentation violation - dumping core [PID = %d, %s]", ! getpid(), (isserver) ? "isserver" : ((amchild) ? "amchild" : "parent")); abort(); /*NOTREACHED*/ --- 238,245 ---- */ extern void coredump() { ! error("Segmentation violation - dumping core [PID = %ld, %s]", ! (long)getpid(), (isserver) ? "isserver" : ((amchild) ? "amchild" : "parent")); abort(); /*NOTREACHED*/ *************** *** 820,830 **** void runcommand(cmd) char *cmd; { ! int fd[2], pid, i; int status; char *cp, *s; char sbuf[BUFSIZ], buf[BUFSIZ]; ! if (pipe(fd) < 0) { error("pipe of %s failed: %s", cmd, SYSERR); return; --- 820,831 ---- void runcommand(cmd) char *cmd; { ! int fd[2]; int status; char *cp, *s; char sbuf[BUFSIZ], buf[BUFSIZ]; ! pid_t pid, i; ! if (pipe(fd) < 0) { error("pipe of %s failed: %s", cmd, SYSERR); return;