mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-29 10:30:50 +08:00
1f232abc89
compiler warnings found this way. * libc/stdio/freopen.c (_freopen_r): Fix bug setting _flags. * libc/include/stdio.h (_rename): Define when building newlib. * libc/include/sys/signal.h (_kill): Ditto. * libc/include/sys/stat.h (_mkdir): Ditto. * libc/include/sys/time.h (_gettimeofday): Ditto. * libc/include/sys/times.h (_times): Ditto. * libc/include/sys/wait.h (_wait): Ditto. * libc/locale/lmessages.c (empty): Don't define for Cygwin. * libc/locale/lmonetary.c (cnv): Ditto. * libc/locale/nl_langinfo.c (nl_langinfo): Ditto for variable s. * libc/posix/collate.c: Throughout cast to avoid compiler warning. * libc/posix/engine.c (matcher): Initialize dp to avoid compiler warning. * libc/posix/glob.c: Disable on Cygwin. Explain why. * libc/posix/regcomp.c: Fix "uninitialized" compiler warnings. (dissect): Deliberately silence gcc compiler warning. Add comment to explain why. * libc/posix/wordexp.c (wordexp): Remove num_bytes variable since result is never used. * libc/posix/popen.c (popen): Ditto for variable last. * libc/reent/mkdirr.c: Include sys/stat.h. * libc/reent/renamer.c: Include stdio.h. * libc/search/hash.c: Throughout use underscored variants of the stat function family. (init_hash): Add missing definition for the __USE_INTERNAL_STAT64 case. * libc/search/hash_bigkey.c (__big_insert): Add parenthesis to avoid compiler warning. * libc/search/hash_page.c (overflow_page): Initalize freep to NULL to avoid compiler warning. * libc/stdio/asiprintf.c (_asiprintf_r): Cast unsigned char * to char * to avoid compiler warning. (asiprintf): Ditto. * libc/stdio/asprintf.c (_asprintf_r): Ditto. (asprintf): Ditto. * libc/stdio/vasiprintf.c (_vasiprintf_r): Ditto. * libc/stdio/vasprintf.c (_vasprintf_r): Ditto. * libc/stdio/mktemp.c (_gettemp): Cast to unsigned char in call to isdigit to avoid compiler warning. * libc/stdio/vfprintf.c (_VFPRINTF_R): Initialize variables used for grouping to avoid compiler warning. Only define and set nseps and nrepeats if they are really used. * libc/stdio/vfwprintf.c (_VFWPRINTF_R): Ditto. Only define state if it is really used. * libc/stdio/vfscanf.c (u_char): Revert to be defined as unsigned char. (__SVFSCANF_R): Cast fmt in call to __mbtowc. * libc/stdlib/mbtowc_r.c (JIS_state_table): Disable when building Cygwin. (JIS_action_table): Ditto. * libc/stdlib/wctomb_r.c (__utf8_wctomb): Add parenthesis to avoid compiler warning. * libc/string/strcasestr.c: Deliberately silence gcc compiler warning. Add comment to explain why. * libc/time/strptime.c (strptime): Cast to unsigned char in calls to isspace to avoid compiler warning. * libm/math/e_atan2.c (__ieee754_atan2): Add parenthesis to avoid compiler warning. * libm/math/e_exp.c (__ieee754_exp): Initialize k to 0 to avoid compiler warning. Drop setting it to 0 later. * libm/math/ef_exp.c (__ieee754_expf): Ditto. * libm/math/e_pow.c (__ieee754_pow): Add braces to avoid compiler warning. * libm/math/ef_pow.c (__ieee754_powf): Ditto. * libm/math/er_lgamma.c (__ieee754_lgamma_r): Initialize nadj to 0 to avoid compiler warning. * libm/math/erf_lgamma.c (__ieee754_lgammaf_r): Ditto. * libm/math/e_rem_pio2.c (__ieee754_rem_pio2): Ditto for variable z. * libm/common/sf_round.c (roundf): Remove signbit variable since result is never used.
186 lines
4.6 KiB
C
186 lines
4.6 KiB
C
/* Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software
|
|
* is freely granted, provided that this notice is preserved.
|
|
*/
|
|
#ifndef _NO_WORDEXP
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <ctype.h>
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <glob.h>
|
|
#include <pwd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include <wordexp.h>
|
|
|
|
#define MAXLINELEN 500
|
|
|
|
/* Note: This implementation of wordexp requires a version of bash
|
|
that supports the --wordexp and --protected arguments to be present
|
|
on the system. It does not support the WRDE_UNDEF flag. */
|
|
int
|
|
wordexp(const char *words, wordexp_t *pwordexp, int flags)
|
|
{
|
|
FILE *f;
|
|
FILE *f_err;
|
|
char tmp[MAXLINELEN];
|
|
int i = 0;
|
|
int offs = 0;
|
|
char *iter;
|
|
pid_t pid;
|
|
int num_words = 0;
|
|
int fd[2];
|
|
int fd_err[2];
|
|
int err = 0;
|
|
|
|
if (pwordexp == NULL)
|
|
{
|
|
return WRDE_NOSPACE;
|
|
}
|
|
|
|
if (flags & WRDE_REUSE)
|
|
wordfree(pwordexp);
|
|
|
|
if ((flags & WRDE_APPEND) == 0)
|
|
{
|
|
pwordexp->we_wordc = 0;
|
|
pwordexp->we_wordv = NULL;
|
|
}
|
|
|
|
if (flags & WRDE_DOOFFS)
|
|
{
|
|
offs = pwordexp->we_offs;
|
|
|
|
if(!(pwordexp->we_wordv = (char **)realloc(pwordexp->we_wordv, (pwordexp->we_wordc + offs + 1) * sizeof(char *))))
|
|
return WRDE_NOSPACE;
|
|
|
|
for (i = 0; i < offs; i++)
|
|
pwordexp->we_wordv[i] = NULL;
|
|
}
|
|
|
|
pipe(fd);
|
|
pipe(fd_err);
|
|
pid = fork();
|
|
|
|
if (pid > 0)
|
|
{
|
|
/* In parent process. */
|
|
|
|
/* Close write end of parent's pipe. */
|
|
close(fd[1]);
|
|
close(fd_err[1]);
|
|
|
|
/* f_err is the standard error from the shell command. */
|
|
f_err = fdopen(fd_err[0], "r");
|
|
|
|
/* Check for errors. */
|
|
if (fgets(tmp, MAXLINELEN, f_err))
|
|
{
|
|
if (strstr(tmp, "EOF"))
|
|
err = WRDE_SYNTAX;
|
|
else if (strstr(tmp, "`\n'") || strstr(tmp, "`|'")
|
|
|| strstr(tmp, "`&'") || strstr(tmp, "`;'")
|
|
|| strstr(tmp, "`<'") || strstr(tmp, "`>'")
|
|
|| strstr(tmp, "`('") || strstr(tmp, "`)'")
|
|
|| strstr(tmp, "`{'") || strstr(tmp, "`}'"))
|
|
err = WRDE_BADCHAR;
|
|
else if (strstr(tmp, "command substitution"))
|
|
err = WRDE_CMDSUB;
|
|
else
|
|
err = WRDE_SYNTAX;
|
|
|
|
if (flags & WRDE_SHOWERR)
|
|
{
|
|
fprintf(stderr, tmp);
|
|
while(fgets(tmp, MAXLINELEN, f_err))
|
|
fprintf(stderr, tmp);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
/* f is the standard output from the shell command. */
|
|
f = fdopen(fd[0], "r");
|
|
|
|
/* Get number of words expanded by shell. */
|
|
fgets(tmp, MAXLINELEN, f);
|
|
|
|
if((iter = strchr(tmp, '\n')))
|
|
*iter = '\0';
|
|
|
|
num_words = atoi(tmp);
|
|
|
|
if(!(pwordexp->we_wordv = (char **)realloc(pwordexp->we_wordv,
|
|
(pwordexp->we_wordc + num_words + offs + 1) * sizeof(char *))))
|
|
return WRDE_NOSPACE;
|
|
|
|
/* Get number of bytes required for storage of num_words words. */
|
|
fgets(tmp, MAXLINELEN, f);
|
|
|
|
if((iter = strchr(tmp, '\n')))
|
|
*iter = '\0';
|
|
|
|
/* Get each expansion from the shell output, and store each in
|
|
pwordexp's we_wordv vector. */
|
|
for(i = 0; i < num_words; i++)
|
|
{
|
|
fgets(tmp, MAXLINELEN, f);
|
|
|
|
if((iter = strchr(tmp, '\n')))
|
|
*iter = '\0';
|
|
|
|
pwordexp->we_wordv[pwordexp->we_wordc + offs + i] = strdup(tmp);
|
|
}
|
|
|
|
pwordexp->we_wordv[pwordexp->we_wordc + offs + i] = NULL;
|
|
pwordexp->we_wordc += num_words;
|
|
|
|
close(fd[0]);
|
|
close(fd_err[0]);
|
|
|
|
/* Wait for child to finish. */
|
|
waitpid (pid, NULL, 0);
|
|
|
|
return WRDE_SUCCESS;
|
|
}
|
|
else
|
|
{
|
|
/* In child process. */
|
|
|
|
/* Close read end of child's pipe. */
|
|
close(fd[0]);
|
|
close(fd_err[0]);
|
|
|
|
/* Pipe standard output to parent process via fd. */
|
|
if (fd[1] != STDOUT_FILENO)
|
|
{
|
|
dup2(fd[1], STDOUT_FILENO);
|
|
/* fd[1] no longer required. */
|
|
close(fd[1]);
|
|
}
|
|
|
|
/* Pipe standard error to parent process via fd_err. */
|
|
if (fd_err[1] != STDERR_FILENO)
|
|
{
|
|
dup2(fd_err[1], STDERR_FILENO);
|
|
/* fd_err[1] no longer required. */
|
|
close(fd_err[1]);
|
|
}
|
|
|
|
if (flags & WRDE_NOCMD)
|
|
execl("/bin/bash", "bash", "--protected", "--wordexp", words, (char *)0);
|
|
else
|
|
execl("/bin/bash", "bash", "--wordexp", words, (char *)0);
|
|
}
|
|
return WRDE_SUCCESS;
|
|
}
|
|
#endif /* !_NO_WORDEXP */
|