| dirname.c (98937) | dirname.c (106121) |
|---|---|
| 1/* $OpenBSD: dirname.c,v 1.6 2001/06/28 04:27:19 pjanzen Exp $ */ | 1/* $OpenBSD: dirname.c,v 1.7 2002/05/24 21:22:37 deraadt Exp $ */ |
| 2 3/* 4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions 9 * are met: --- 16 unchanged lines hidden (view full) --- 26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 */ 29 30#include "includes.h" 31#ifndef HAVE_DIRNAME 32 33#if defined(LIBC_SCCS) && !defined(lint) | 2 3/* 4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions 9 * are met: --- 16 unchanged lines hidden (view full) --- 26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 */ 29 30#include "includes.h" 31#ifndef HAVE_DIRNAME 32 33#if defined(LIBC_SCCS) && !defined(lint) |
| 34static char rcsid[] = "$OpenBSD: dirname.c,v 1.6 2001/06/28 04:27:19 pjanzen Exp $"; | 34static char rcsid[] = "$OpenBSD: dirname.c,v 1.7 2002/05/24 21:22:37 deraadt Exp $"; |
| 35#endif /* LIBC_SCCS and not lint */ 36 37#include <errno.h> 38#include <string.h> 39#include <sys/param.h> 40 41char * 42dirname(path) 43 const char *path; 44{ 45 static char bname[MAXPATHLEN]; 46 register const char *endp; 47 48 /* Empty or NULL string gets treated as "." */ 49 if (path == NULL || *path == '\0') { | 35#endif /* LIBC_SCCS and not lint */ 36 37#include <errno.h> 38#include <string.h> 39#include <sys/param.h> 40 41char * 42dirname(path) 43 const char *path; 44{ 45 static char bname[MAXPATHLEN]; 46 register const char *endp; 47 48 /* Empty or NULL string gets treated as "." */ 49 if (path == NULL || *path == '\0') { |
| 50 (void)strcpy(bname, "."); | 50 (void)strlcpy(bname, ".", sizeof bname); |
| 51 return(bname); 52 } 53 54 /* Strip trailing slashes */ 55 endp = path + strlen(path) - 1; 56 while (endp > path && *endp == '/') 57 endp--; 58 59 /* Find the start of the dir */ 60 while (endp > path && *endp != '/') 61 endp--; 62 63 /* Either the dir is "/" or there are no slashes */ 64 if (endp == path) { | 51 return(bname); 52 } 53 54 /* Strip trailing slashes */ 55 endp = path + strlen(path) - 1; 56 while (endp > path && *endp == '/') 57 endp--; 58 59 /* Find the start of the dir */ 60 while (endp > path && *endp != '/') 61 endp--; 62 63 /* Either the dir is "/" or there are no slashes */ 64 if (endp == path) { |
| 65 (void)strcpy(bname, *endp == '/' ? "/" : "."); | 65 (void)strlcpy(bname, *endp == '/' ? "/" : ".", sizeof bname); |
| 66 return(bname); 67 } else { 68 do { 69 endp--; 70 } while (endp > path && *endp == '/'); 71 } 72 73 if (endp - path + 2 > sizeof(bname)) { 74 errno = ENAMETOOLONG; 75 return(NULL); 76 } 77 strlcpy(bname, path, endp - path + 2); 78 return(bname); 79} 80#endif | 66 return(bname); 67 } else { 68 do { 69 endp--; 70 } while (endp > path && *endp == '/'); 71 } 72 73 if (endp - path + 2 > sizeof(bname)) { 74 errno = ENAMETOOLONG; 75 return(NULL); 76 } 77 strlcpy(bname, path, endp - path + 2); 78 return(bname); 79} 80#endif |