ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make use of the new spawnvp function in wine{gcc,wrap}.

This commit is contained in:
Dimitrie O. Paun 2003-04-02 22:36:29 +00:00 committed by Alexandre Julliard
parent 3569c2344f
commit 832e4388d4
2 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/winegcc.c
View File

@ -27,13 +27,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
static char **tmp_files; static char **tmp_files;
static int nb_tmp_files; static int nb_tmp_files;
@ -75,29 +69,17 @@ char *strmake(const char *fmt, ...)
void spawn(char *const argv[]) void spawn(char *const argv[])
{ {
#ifdef HAVE__SPAWNVP int i, status;
if (!_spawnvp( _P_WAIT, argv[0], argv)) return;
#else
int pid, status, wret, i;
if (verbose) if (verbose)
{ {
for(i = 0; argv[i]; i++) printf("%s ", argv[i]); for(i = 0; argv[i]; i++) printf("%s ", argv[i]);
printf("\n"); printf("\n");
} }
if (!(status = spawnvp( _P_WAIT, argv[0], argv))) return;
if ((pid = fork()) == 0) execvp(argv[0], argv); if (status > 0) error("%s failed.", argv[0]);
else if (pid > 0) else perror("Error:");
{
while (pid != (wret = waitpid(pid, &status, 0)))
if (wret == -1 && errno != EINTR) break;
if (pid == wret && WIFEXITED(status) && WEXITSTATUS(status) == 0) return;
error("%s failed.", argv[0]);
}
#endif /* HAVE__SPAWNVP */
perror("Error:");
exit(3); exit(3);
} }

28
tools/winewrap.c
View File

@ -27,13 +27,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifndef WINEDLLS #ifndef WINEDLLS
#define WINEDLLS "/usr/local/lib/wine" #define WINEDLLS "/usr/local/lib/wine"
@ -296,29 +290,17 @@ void create_file(const char *name, const char *fmt, ...)
void spawn(char *const argv[]) void spawn(char *const argv[])
{ {
#ifdef HAVE__SPAWNVP int i, status;
if (!_spawnvp( _P_WAIT, argv[0], argv)) return;
#else
int pid, status, wret, i;
if (verbose) if (verbose)
{ {
for(i = 0; argv[i]; i++) printf("%s ", argv[i]); for(i = 0; argv[i]; i++) printf("%s ", argv[i]);
printf("\n"); printf("\n");
} }
if (!(status = spawnvp( _P_WAIT, argv[0], argv))) return;
if ((pid = fork()) == 0) execvp(argv[0], argv); if (status > 0) error("%s failed.", argv[0]);
else if (pid > 0) else perror("Error:");
{
while (pid != (wret = waitpid(pid, &status, 0)))
if (wret == -1 && errno != EINTR) break;
if (pid == wret && WIFEXITED(status) && WEXITSTATUS(status) == 0) return;
error("%s failed.", argv[0]);
}
#endif /* HAVE__SPAWNVP */
perror("Error:");
exit(3); exit(3);
} }