summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-06-13 08:53:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-06-13 08:53:45 +0000
commit19ef5736030c9419a10558fcedb165495b87228c (patch)
tree6bad7e39cabfb446b576ba4a5c0dc9c747601680
parent837deb53e102d84d77ffa17334728eb8feb30669 (diff)
downloaddrakx-backup-do-not-use-19ef5736030c9419a10558fcedb165495b87228c.tar
drakx-backup-do-not-use-19ef5736030c9419a10558fcedb165495b87228c.tar.gz
drakx-backup-do-not-use-19ef5736030c9419a10558fcedb165495b87228c.tar.bz2
drakx-backup-do-not-use-19ef5736030c9419a10558fcedb165495b87228c.tar.xz
drakx-backup-do-not-use-19ef5736030c9419a10558fcedb165495b87228c.zip
small fixes in KA special code
-rw-r--r--mdk-stage1/network.c1
-rw-r--r--mdk-stage1/url.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index 5f8e3a042..3270c5593 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <netdb.h>
#include <resolv.h>
+#include <dirent.h>
#include "stage1.h"
#include "frontend.h"
diff --git a/mdk-stage1/url.c b/mdk-stage1/url.c
index a5687920e..fb6c5de74 100644
--- a/mdk-stage1/url.c
+++ b/mdk-stage1/url.c
@@ -56,7 +56,7 @@
#define TIMEOUT_SECS 60
#define BUFFER_SIZE 4096
-void pause(void) { unsigned char t; fflush(stdout); read(0, &t, 1); }
+void my_pause(void) { unsigned char t; fflush(stdout); read(0, &t, 1); }
static int ftp_check_response(int sock, char ** str)
@@ -521,7 +521,7 @@ enum return_type ka_wait_for_stage2(void) {
close(2);
execve(mkfs_launch[0], mkfs_launch,grab_env()); /* Formating the ramdisk */
printf("KA: Can't execute %s\n<press Enter>\n", mkfs_launch[0]);
- pause();
+ my_pause();
return KAERR_CANTFORK;
}
while (wait4(-1, &wait_status, 0, NULL) != pid) {}; /* Waiting the end of mkfs */
@@ -536,7 +536,7 @@ enum return_type ka_wait_for_stage2(void) {
close(2); /* Closing stderr */
execve(ka_launch[0], ka_launch,grab_env()); /* Running ka-deploy (client side) */
printf("KA: Can't execute %s\n<press Enter>\n", ka_launch[0]);
- pause();
+ my_pause();
return KAERR_CANTFORK;
}
while (wait4(-1, &wait_status, 0, NULL) != pid) {}; /* Waiting the end of duplication */