summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
Diffstat (limited to 'loader')
-rw-r--r--loader/Makefile2
-rw-r--r--loader/kickstart.c2
-rw-r--r--loader/lang.c20
-rw-r--r--loader/loader.c28
-rw-r--r--loader/net.c4
-rw-r--r--loader/popen.c2
-rw-r--r--loader/urls.c8
7 files changed, 39 insertions, 27 deletions
diff --git a/loader/Makefile b/loader/Makefile
index d5cc4f4aa..bf44d4a89 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -18,7 +18,7 @@ endif
PCMCIAOBJS = pcmcia.o $(NETOBJS)
OPTS = -O2 -g
-CFLAGS = $(DEBUG) $(OPTS) -Wall -D_GNU_SOURCE=1 -I/usr/include/rpm -I.. -DUSE_ALT_DNS=1 -DVERSION='"$(VERSION)"'
+CFLAGS = $(DEBUG) $(OPTS) -Wall -D_GNU_SOURCE=1 -I/usr/include/rpm -I.. -DUSE_ALT_DNS=1 -DVERSION='"$(VERSION)"' -DHAVE_LIBIO_H
ALLOBJS = $(OBJS) $(PCMCIAOBJS)
diff --git a/loader/kickstart.c b/loader/kickstart.c
index 7daa0d445..4a13ae550 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -103,7 +103,7 @@ int ksReadCommands(char * cmdFile) {
} else if (!strcmp(start, "%packages")) {
inPackages = 1;
} else {
- if (poptParseArgvString(start, &argc, &argv) || !argc) {
+ if (poptParseArgvString(start, &argc, (const char ***) &argv) || !argc) {
newtWinMessage(_("Kickstart Error"), _("OK"),
_("Error on line %d of kickstart file %s."),
argv[0], line, cmdFile);
diff --git a/loader/lang.c b/loader/lang.c
index a1c005e78..d9484a3bc 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -10,6 +10,10 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include <zlib.h>
+
+#include <glob.h> /* XXX rpmlib.h */
+#include <dirent.h> /* XXX rpmlib.h */
+
#include <rpm/rpmio.h>
#include <linux/keyboard.h>
#include <linux/kd.h>
@@ -121,18 +125,18 @@ void loadLanguage (char * file, int flags) {
sprintf(filename, "/etc/loader.tr");
}
- stream = fdOpen(file, O_RDONLY, 0644);
+ stream = Fopen (file, "r.fdio");
- if (fdFileno(stream) < 0) {
+ if (!stream || Ferror (stream)) {
newtWinMessage("Error", "OK", "Cannot open %s: %s. Installation will "
- "proceed in English.", file, strerror(errno));
+ "proceed in English.", file, Fstrerror(stream));
return ;
}
sprintf(filename, "%s.tr", key);
rc = installCpioFile(stream, filename, "/tmp/translation", 1);
- fdClose(stream);
+ Fclose(stream);
if (rc || access("/tmp/translation", R_OK)) {
newtWinMessage("Error", "OK", "Cannot get translation file %s.\n",
@@ -181,15 +185,15 @@ static int loadFont(char * fontFile, int flags) {
#if 0
if (!FL_TESTING(flags)) {
#endif
- stream = fdOpen("/etc/fonts.cgz", O_RDONLY, 0644);
- if (fdFileno(stream) < 0) {
+ stream = Fopen("/etc/fonts.cgz", "r.fdio");
+ if (!stream || Ferror (stream)) {
newtWinMessage("Error", "OK",
- "Cannot open fonts: %s", strerror(errno));
+ "Cannot open fonts: %s", Fstrerror(stream));
return LOADER_ERROR;
}
rc = installCpioFile(stream, fontFile, "/tmp/font", 1);
- fdClose(stream);
+ Fclose(stream);
if (rc || access("/tmp/font", R_OK)) {
return LOADER_ERROR;
}
diff --git a/loader/loader.c b/loader/loader.c
index 9740a76db..c24ae9ceb 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -28,6 +28,10 @@
#include <net/if.h>
#include <newt.h>
#include <popt.h>
+
+#include <glob.h> /* XXX rpmlib.h */
+#include <dirent.h> /* XXX rpmlib.h */
+
#include <rpmio.h>
#include <stdlib.h>
#include <string.h>
@@ -960,7 +964,7 @@ static char * mountUrlImage(struct installMethod * method,
fd = urlinstStartTransfer(&ui, "base/stage2.img");
- if (fd == NULL || fdFileno(fd) < 0) {
+ if (fd == NULL || Ferror(fd)) {
newtPopWindow();
snprintf(buf, sizeof(buf), "%s/RedHat/base/stage2.img",
ui.urlprefix);
@@ -971,7 +975,7 @@ static char * mountUrlImage(struct installMethod * method,
break;
}
- rc = loadStage2Ramdisk(fdFileno(fd), 0, flags);
+ rc = loadStage2Ramdisk(Fileno(fd), 0, flags);
urlinstFinishTransfer(fd);
if (!rc)
stage = URL_STAGE_DONE;
@@ -1150,7 +1154,7 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
};
if (!ksGetCommand(KS_CMD_DRIVERDISK, NULL, &ksArgc, &ksArgv)) {
- optCon = poptGetContext(NULL, ksArgc, ksArgv, diskTable, 0);
+ optCon = poptGetContext(NULL, ksArgc, (const char **) ksArgv, diskTable, 0);
do {
if ((rc = poptGetNextOpt(optCon)) < -1) {
@@ -1161,7 +1165,7 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
break;
}
- fs = poptGetArg(optCon);
+ fs = (char *) poptGetArg(optCon);
if (!fs || poptGetArg(optCon)) {
logMessage("bad arguments to kickstart driverdisk command");
@@ -1193,7 +1197,7 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
while (!ksGetCommand(KS_CMD_DEVICE, ksArgv, &ksArgc, &ksArgv)) {
opts = NULL;
- optCon = poptGetContext(NULL, ksArgc, ksArgv, table, 0);
+ optCon = poptGetContext(NULL, ksArgc, (const char **) ksArgv, table, 0);
if ((rc = poptGetNextOpt(optCon)) < -1) {
logMessage("bad argument to kickstart device command %s: %s",
@@ -1202,8 +1206,8 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
continue;
}
- type = poptGetArg(optCon);
- device = poptGetArg(optCon);
+ type = (char *) poptGetArg(optCon);
+ device = (char *) poptGetArg(optCon);
if (!type || !device || poptGetArg(optCon)) {
logMessage("bad arguments to kickstart device command");
@@ -1217,7 +1221,7 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
}
if (opts)
- poptParseArgvString(opts, &rc, &optv);
+ poptParseArgvString(opts, &rc, (const char ***) &optv);
else
optv = NULL;
@@ -1332,7 +1336,7 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
if (table) {
ksGetCommand(ksType, NULL, &ksArgc, &ksArgv);
- optCon = poptGetContext(NULL, ksArgc, ksArgv, table, 0);
+ optCon = poptGetContext(NULL, ksArgc, (const char **) ksArgv, table, 0);
if ((rc = poptGetNextOpt(optCon)) < -1) {
logMessage("bad argument to kickstart method command %s: %s",
@@ -1447,7 +1451,7 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource) {
cmdLine = buf;
}
- if (poptParseArgvString(cmdLine, &argc, &argv)) return flags;
+ if (poptParseArgvString(cmdLine, &argc, (const char ***) &argv)) return flags;
for (i = 0; i < argc; i++) {
if (!strcasecmp(argv[i], "expert"))
@@ -1842,7 +1846,7 @@ int main(int argc, char ** argv) {
flags |= LOADER_FLAGS_SERIAL;
}
- optCon = poptGetContext(NULL, argc, argv, optionTable, 0);
+ optCon = poptGetContext(NULL, argc, (const char **) argv, optionTable, 0);
if ((rc = poptGetNextOpt(optCon)) < -1) {
fprintf(stderr, "bad option %s: %s\n",
@@ -1851,7 +1855,7 @@ int main(int argc, char ** argv) {
exit(1);
}
- if ((arg = poptGetArg(optCon))) {
+ if ((arg = (char *) poptGetArg(optCon))) {
fprintf(stderr, "unexpected argument: %s\n", arg);
exit(1);
}
diff --git a/loader/net.c b/loader/net.c
index a41f1eb1e..8c4534bb5 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -516,12 +516,12 @@ int kickstartNetwork(char * device, struct networkDeviceConfig * netDev,
ksArgc = 1;
}
- optCon = poptGetContext(NULL, ksArgc, ksArgv, ksOptions, 0);
+ optCon = poptGetContext(NULL, ksArgc, (const char **) ksArgv, ksOptions, 0);
while ((rc = poptGetNextOpt(optCon)) >= 0) {
parseAddress = NULL;
netSet = 0;
- arg = poptGetOptArg(optCon);
+ arg = (char *) poptGetOptArg(optCon);
switch (rc) {
case 'g':
diff --git a/loader/popen.c b/loader/popen.c
index 21edc3c0e..75a15031f 100644
--- a/loader/popen.c
+++ b/loader/popen.c
@@ -24,7 +24,7 @@ FILE * popen(const char * command, const char * type) {
if (strcmp(type, "r") || lastRequest.f)
return NULL;
- if (poptParseArgvString(command, &argc, &argv)) {
+ if (poptParseArgvString(command, &argc, (const char ***) &argv)) {
return NULL;
}
diff --git a/loader/urls.c b/loader/urls.c
index 5c991bc6c..d8908970e 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -3,6 +3,10 @@
#include <fcntl.h>
#include <netinet/in.h>
#include <newt.h>
+
+#include <glob.h> /* XXX rpmlib.h */
+#include <dirent.h> /* XXX rpmlib.h */
+
#include <rpmio.h>
#include <rpmlib.h>
#include <rpmurl.h>
@@ -72,7 +76,7 @@ FD_t urlinstStartTransfer(struct iurlinfo * ui, char * filename) {
strcpy(buf, ui->urlprefix);
strcat(buf, "/RedHat/");
strcat(buf, filename);
- fd = ufdOpen(buf, O_RDONLY, 600);
+ fd = Fopen(buf, "r.ufdio");
return fd;
}
@@ -102,7 +106,7 @@ char * addrToIp(char * hostname) {
int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
char * doSecondarySetup) {
newtComponent form, okay, cancel, siteEntry, dirEntry;
- newtComponent answer, text, cb = NULL;
+ newtComponent answer, text;
char * site, * dir;
char * reflowedText = NULL;
int width, height, len;
generated by cgit (git 2.34.1) at 2026-04-27 20:57:24 +0000