diff options
| author | Russell Coker <russell@coker.com.au> | 2002-01-11 18:27:17 +0000 |
|---|---|---|
| committer | Russell Coker <russell@coker.com.au> | 2002-01-11 18:27:17 +0000 |
| commit | 58d58e6be99ed13fbfe222cb15af7db75154d6c9 (patch) | |
| tree | 42c3619709e00a1712af519e51952c8a0894f3ba /pppd/utils.c | |
| parent | e635acbbac0a7f27d110c4ad4d10c71f26b708f4 (diff) | |
| download | ppp-58d58e6be99ed13fbfe222cb15af7db75154d6c9.tar.gz | |
Fix for locking on Linux and related systems, particularly for devfs.
Also include <time.h> to avoid some warnings.
Diffstat (limited to 'pppd/utils.c')
| -rw-r--r-- | pppd/utils.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pppd/utils.c b/pppd/utils.c index 8b83e34..43ed317 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id: utils.c,v 1.15 2001/11/09 10:33:04 paulus Exp $" +#define RCSID "$Id: utils.c,v 1.16 2002/01/11 18:27:17 etbe Exp $" #include <stdio.h> #include <ctype.h> @@ -29,6 +29,7 @@ #include <fcntl.h> #include <syslog.h> #include <netdb.h> +#include <time.h> #include <utmp.h> #include <pwd.h> #include <sys/param.h> @@ -851,9 +852,20 @@ lock(dev) major(sbuf.st_rdev), minor(sbuf.st_rdev)); #else char *p; + char lockdev[MAXPATHLEN]; + + if ((p = strstr(dev, "dev/")) != NULL) { + dev = p + 4; + strncpy(lockdev, dev, MAXPATHLEN-1); + lockdev[MAXPATHLEN-1] = 0; + while ((p = strrchr(lockdev, '/')) != NULL) { + *p = '_'; + } + dev = lockdev; + } else + if ((p = strrchr(dev, '/')) != NULL) + dev = p + 1; - if ((p = strrchr(dev, '/')) != NULL) - dev = p + 1; slprintf(lock_file, sizeof(lock_file), "%s/LCK..%s", LOCK_DIR, dev); #endif |