diff options
author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
---|---|---|
committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
commit | 09e967c2d732783b2579e4e120cd9b608404cb00 (patch) | |
tree | 8d2783a6a7e33608c6012efd6a88b8f5694df81d /mdk-stage1/dietlibc/lib/execlp.c | |
parent | 18fcff49d3c836697d3b75a3d01d31c700e69974 (diff) | |
download | drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar.gz drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar.bz2 drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.tar.xz drakx-backup-do-not-use-09e967c2d732783b2579e4e120cd9b608404cb00.zip |
Merge from R9_0-AMD64, most notably:
- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes
Diffstat (limited to 'mdk-stage1/dietlibc/lib/execlp.c')
-rw-r--r-- | mdk-stage1/dietlibc/lib/execlp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mdk-stage1/dietlibc/lib/execlp.c b/mdk-stage1/dietlibc/lib/execlp.c index 3aea1e960..27dc0bb95 100644 --- a/mdk-stage1/dietlibc/lib/execlp.c +++ b/mdk-stage1/dietlibc/lib/execlp.c @@ -2,7 +2,7 @@ #include <unistd.h> #include <errno.h> #include <stdlib.h> -#include "dietstdarg.h" +#include "dietfeatures.h" int execlp(const char* file, const char *arg,...) { va_list ap,bak; @@ -15,12 +15,12 @@ int execlp(const char* file, const char *arg,...) { ++n; va_end (ap); if ((argv=(char **)alloca(n*sizeof(char*)))) { - argv[0]=arg; + argv[0]=(char*)arg; for (i=0; i<n; ++i) argv[i+1]=va_arg(bak,char *); va_end (bak); return execvp(file,argv); } - __set_errno(ENOMEM); + errno=ENOMEM; return -1; } |