From db042deee509655d1b7e993d4ee283cbda3ceac0 Mon Sep 17 00:00:00 2001 From: ache Date: Mon, 4 Mar 1996 10:38:42 +0000 Subject: Eliminate multiply uucplock.c --- usr.sbin/ppp/Makefile | 6 ++- usr.sbin/ppp/uucplock.c | 123 ------------------------------------------------ 2 files changed, 4 insertions(+), 125 deletions(-) delete mode 100644 usr.sbin/ppp/uucplock.c diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 07c2af6..33a2b9f 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1996/01/11 17:48:33 phk Exp $ +# $Id: Makefile,v 1.5 1996/01/30 20:04:20 phk Exp $ PROG= ppp SRCS= async.c auth.c ccp.c chap.c chat.c command.c filter.c fsm.c hdlc.c \ @@ -6,11 +6,13 @@ SRCS= async.c auth.c ccp.c chap.c chat.c command.c filter.c fsm.c hdlc.c \ pap.c pred.c route.c slcompress.c timer.c systems.c uucplock.c vars.c \ vjcomp.c arp.c #CFLAGS+= -DHAVE_SHELL_CMD_WITH_ANY_MODE -CFLAGS += -Wall +CFLAGS += -Wall -DUSE_PERROR LDADD += -lmd DPADD += ${LIBMD} MAN8= ppp.8 BINMODE=4555 BINOWN= root +.PATH: ${.CURDIR}/../../sbin/startslip + .include diff --git a/usr.sbin/ppp/uucplock.c b/usr.sbin/ppp/uucplock.c deleted file mode 100644 index 5b1ffa2..0000000 --- a/usr.sbin/ppp/uucplock.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id: uucplock.c,v 1.6 1996/01/10 21:28:03 phk Exp $ - * - */ - -#ifndef lint -static char const sccsid[] = "@(#)uucplock.c 5.5 (Berkeley) 6/1/90"; -#endif /* not lint */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "pathnames.h" - -/* - * uucp style locking routines - * return: 0 - success - * -1 - failure - */ - -int -uu_lock(ttyname) - char *ttyname; -{ - extern int errno; - int fd, pid; - char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN]; - char pid_buf[64]; - off_t lseek(); - - (void)sprintf(tbuf, _PATH_LOCKDIRNAME, ttyname); - fd = open(tbuf, O_RDWR|O_CREAT|O_EXCL, 0664); - if (fd < 0) { - /* - * file is already locked - * check to see if the process holding the lock still exists - */ - fd = open(tbuf, O_RDWR, 0); - if (fd < 0) { - perror("lock open"); - return(-1); - } - if (read(fd, pid_buf, sizeof(pid_buf)) <= 0) { - (void)close(fd); - perror("lock read"); - return(-1); - } - - pid = atoi(pid_buf); - - if (kill(pid, 0) == 0 || errno != ESRCH) { - (void)close(fd); /* process is still running */ - return(-1); - } - /* - * The process that locked the file isn't running, so - * we'll lock it ourselves - */ - if (lseek(fd, (off_t) 0, L_SET) < 0) { - (void)close(fd); - perror("lock lseek"); - return(-1); - } - /* fall out and finish the locking process */ - } - pid = getpid(); - sprintf(pid_buf, "%10u\n", pid); - if (write(fd, pid_buf, strlen(pid_buf)) != strlen(pid_buf)) { - (void)close(fd); - (void)unlink(tbuf); - perror("lock write"); - return(-1); - } - (void)close(fd); - return(0); -} - -int -uu_unlock(ttyname) - char *ttyname; -{ - char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN]; - - (void)sprintf(tbuf, _PATH_LOCKDIRNAME, ttyname); - return(unlink(tbuf)); -} -- cgit v1.1