isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include netdb.h as we should

Browse Source 
added a missing void cast
added SHELL_IF_NO_ARGS support
now use realloc() properly.  would fail if realloc actually moved
the string instead of shrinking it
This commit is contained in:
Todd C. Miller
1995-09-01 04:23:19 +00:00
parent 035886c880
commit 57e17e71d1
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sudo.c
View File

@@ -47,7 +47,7 @@
* However, due to the fact that both of the above are no longer * However, due to the fact that both of the above are no longer
* working at Root Group, I am maintaining the "CU version" of * working at Root Group, I am maintaining the "CU version" of
* sudo. * sudo.
* Todd Miller <millert@cs.colorado.edu> * Todd Miller <Todd.Miller@cs.colorado.edu>
*/ */
#ifndef lint #ifndef lint
@@ -81,6 +81,7 @@ static char rcsid[] = "$Id$";
#include <sys/time.h> #include <sys/time.h>
#include <sys/param.h> #include <sys/param.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h>
#if defined(__osf__) && defined(HAVE_C2_SECURITY) #if defined(__osf__) && defined(HAVE_C2_SECURITY)
#include <sys/security.h> #include <sys/security.h>
#include <prot.h> #include <prot.h>
@@ -163,12 +164,12 @@ struct env_table badenv_table[] = {
/******************************************************************** /********************************************************************
* *
* main () * main()
* *
* the driving force behind sudo... * the driving force behind sudo...
*/ */
main(argc, argv) int main(argc, argv)
int argc; int argc;
char **argv; char **argv;
{ {
@@ -278,8 +279,8 @@ main(argc, argv)
struct stat st; struct stat st;
if (stat(cmnd, &st) < 0) { if (stat(cmnd, &st) < 0) {
fprintf(stderr, "%s: unable to stat %s:", Argv[0], (void) fprintf(stderr, "%s: unable to stat %s:",
cmnd); Argv[0], cmnd);
perror(""); perror("");
exit(1); exit(1);
} }
@@ -474,8 +475,15 @@ static int parse_args()
char *progname = Argv[0]; /* so we can save Argv[0] */ char *progname = Argv[0]; /* so we can save Argv[0] */
int i; int i;
#ifdef SHELL_IF_NO_ARGS
if (Argc < 2) { /* no options and no command */
ret |= MODE_SHELL;
return(ret);
}
#else
if (Argc < 2) /* no options and no command */ if (Argc < 2) /* no options and no command */
usage(1); usage(1);
#endif
while (Argc > 1 && Argv[1][0] == '-') { while (Argc > 1 && Argv[1][0] == '-') {
if (Argv[1][1] != '\0' && Argv[1][2] != '\0') { if (Argv[1][1] != '\0' && Argv[1][2] != '\0') {
@@ -670,7 +678,7 @@ static void load_cmnd(sudo_mode)
args_size += ARG_INC; args_size += ARG_INC;
args_remainder += ARG_INC; args_remainder += ARG_INC;
} while (len >= args_remainder); } while (len >= args_remainder);
if (realloc(cmnd_args, args_size) == NULL) { if ((cmnd_args = realloc(cmnd_args, args_size)) == NULL) {
perror("malloc"); perror("malloc");
(void) fprintf(stderr, "%s: cannot allocate memory!\n", (void) fprintf(stderr, "%s: cannot allocate memory!\n",
Argv[0]); Argv[0]);
@@ -688,9 +696,9 @@ static void load_cmnd(sudo_mode)
} }
*(pos - 1) = '\0'; *(pos - 1) = '\0';
/* XXX - is this worth the cost? */
/* Let's not be wasteful with our memory */ /* Let's not be wasteful with our memory */
(void) realloc(cmnd_args, args_size - args_remainder); if ((pos = realloc(cmnd_args, args_size - args_remainder)))
cmnd_args = pos;
} }
/* /*