mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

don't use popen/pclose. Do it inline.

Browse Source
This commit is contained in:
Todd C. Miller
1998-04-06 03:33:55 +00:00
parent 09bb1a3bf7
commit 1014adbe09
1 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
getcwd.c
View File

@@ -22,6 +22,7 @@
* This module contains getcwd(3) for those systems that lack it. * This module contains getcwd(3) for those systems that lack it.
* getcwd(3) returns a pointer to the current working dir. It uses * getcwd(3) returns a pointer to the current working dir. It uses
* path as a copy-out parameter and malloc(3)s space if path is NULL. * path as a copy-out parameter and malloc(3)s space if path is NULL.
* This implementation of getcwd(3) restricts len(path) to be < MAXPATHLEN.
* *
* Todd C. Miller (millert@colorado.edu) Fri Jun 3 18:32:19 MDT 1994 * Todd C. Miller (millert@colorado.edu) Fri Jun 3 18:32:19 MDT 1994
*/ */
@@ -50,9 +51,9 @@ static char rcsid[] = "$Id$";
#endif /* HAVE_MALLOC_H && !STDC_HEADERS */ #endif /* HAVE_MALLOC_H && !STDC_HEADERS */
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/wait.h>
#include <sys/param.h> #include <sys/param.h>
#include <netinet/in.h> #include <sys/in.h>
#include <pathnames.h> #include <pathnames.h>
#include "compat.h" #include "compat.h"
@@ -64,17 +65,10 @@ extern char *malloc __P((size_t));
extern char *strcpy __P((char *, const char *)); extern char *strcpy __P((char *, const char *));
extern int strlen __P((const char *)); extern int strlen __P((const char *));
extern char *getwd __P((char *)); extern char *getwd __P((char *));
extern FILE *popen __P((const char *, const char *));
extern int pclose __P((FILE *));
extern char *fgets __P((char *, int, FILE *)); extern char *fgets __P((char *, int, FILE *));
#endif /* !STDC_HEADERS */ #endif /* !STDC_HEADERS */
#ifndef _PATH_PWD
#define _PATH_PWD "pwd"
#endif /* _PATH_PWD */
/* /*
* Since we can't count on this being defined... * Since we can't count on this being defined...
*/ */
@@ -87,20 +81,21 @@ extern int errno;
* *
* getcwd() returns a pointer to the current working dir. It uses * getcwd() returns a pointer to the current working dir. It uses
* path as a copy-out parameter and malloc(3)s space if path is NULL. * path as a copy-out parameter and malloc(3)s space if path is NULL.
* getcwd() will use getwd() if available, else it will use pwd(1).
*/ */
char * getcwd(path, len) char * getcwd(path, psize)
char * path; /* path to copy into */ char * path; /* path to copy into */
size_t len; /* length of path */ size_t psize; /* size of path */
{ {
char buf[MAXPATHLEN+1]; /* +1 for the newline */ char buf[MAXPATHLEN+1]; /* +1 for the newline */
size_t blen; /* length of buf */ size_t blen; /* length of buf */
#ifndef HAVE_GETWD FILE * pwd; /* stream for "pwd" process */
FILE * pwd; /* for popen */ int fd[2]; /* for pipe(2) */
#endif /* HAVE_GETWD */ pid_t pid; /* pid of "pwd" process */
int status; /* status from wait(2) */
if (path && len <= 0) { /* sanity check */
if (path && psize == 0) {
errno = EINVAL; errno = EINVAL;
return(NULL); return(NULL);
} }
@@ -108,15 +103,40 @@ char * getcwd(path, len)
/* /*
* open a pipe to pwd and read a line * open a pipe to pwd and read a line
*/ */
if (!(pwd = popen(_PATH_PWD, "r"))) if (pipe(fd) < 0)
return(NULL);
switch ((pid = fork())) {
case -1:
/* fork failed */
(void) close(fd[0]);
(void) close(fd[1]);
return(NULL);
case 0:
/* in child */
(void) dup2(fd[0], 0);
(void) dup2(fd[1], 1);
(void) close(fd[0]);
(void) close(fd[1]);
execl(_PATH_PWD, "pwd", NULL);
_exit(-1); /* should not happen */
}
/* in parent */
if ((pwd = fdopen(fd[0], "r")) == NULL) {
(void) close(fd[0]);
(void) close(fd[1]);
return(NULL); return(NULL);
}
if (!fgets(buf, sizeof(buf), pwd)) { if (!fgets(buf, sizeof(buf), pwd)) {
errno = EACCES; /* what an assumption... */ errno = EACCES; /* what an assumption... */
pclose(pwd); pclose(pwd);
return(NULL); return(NULL);
} }
pclose(pwd);
/* wait for the pipe to close */
while (wait(&status) != pid)
;
blen = strlen(buf); blen = strlen(buf);
if (buf[blen - 1] == '\n') if (buf[blen - 1] == '\n')
@@ -126,7 +146,8 @@ char * getcwd(path, len)
return(NULL); return(NULL);
} }
if (len < blen + 1) { /* sanity check */
if (path && psize < blen + 1) {
errno = ERANGE; errno = ERANGE;
return(NULL); return(NULL);
} }