summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-06-27 21:30:05 -0400
committermidipix <writeonce@midipix.org>2018-06-29 01:37:41 -0400
commitdb27ddd5fe0145b89339693fa0100752184276f0 (patch)
tree7e402ae31251410b0e43d1f495ae98e6db30bb79
parentf7d56b966bc461368d39ac00e6cfb881f22af1c5 (diff)
downloadslibtool-db27ddd5fe0145b89339693fa0100752184276f0.tar.bz2
slibtool-db27ddd5fe0145b89339693fa0100752184276f0.tar.xz
helper interfaces: re-implemented slbt_dump_machine() w. pure fdio.
-rw-r--r--src/helper/slbt_dump_machine.c77
1 files changed, 48 insertions, 29 deletions
diff --git a/src/helper/slbt_dump_machine.c b/src/helper/slbt_dump_machine.c
index 02f281c..1357509 100644
--- a/src/helper/slbt_dump_machine.c
+++ b/src/helper/slbt_dump_machine.c
@@ -23,6 +23,8 @@ static void slbt_dump_machine_child(
char * compiler;
char * argv[3];
+ close(fd[0]);
+
if ((compiler = strrchr(program,'/')))
compiler++;
else
@@ -32,8 +34,6 @@ static void slbt_dump_machine_child(
argv[1] = "-dumpmachine";
argv[2] = 0;
- close(fd[0]);
-
if ((fd[0] = open("/dev/null",O_RDONLY)) >= 0)
if (dup2(fd[0],0) == 0)
if (dup2(fd[1],1) == 1)
@@ -45,25 +45,27 @@ static void slbt_dump_machine_child(
int slbt_dump_machine(
const char * compiler,
char * machine,
- size_t bufsize)
+ size_t buflen)
{
+ int ret;
pid_t pid;
pid_t rpid;
int code;
int fd[2];
- FILE * fmachine;
- char * newline;
char * mark;
- char check[2];
char program[PATH_MAX];
- if (!machine || !bufsize)
+ /* setup */
+ if (!machine || !--buflen) {
+ errno = EINVAL;
return -1;
+ }
if ((size_t)snprintf(program,sizeof(program),"%s",
compiler) >= sizeof(program))
return -1;
+ /* fork */
if (pipe(fd))
return -1;
@@ -73,43 +75,60 @@ int slbt_dump_machine(
return -1;
}
+ /* child */
if (pid == 0)
slbt_dump_machine_child(
program,
fd);
+ /* parent */
+ close(fd[1]);
+
+ mark = machine;
+
+ for (; buflen; ) {
+ ret = read(fd[0],mark,buflen);
+
+ while ((ret < 0) && (errno == EINTR))
+ ret = read(fd[0],mark,buflen);
+
+ if (ret > 0) {
+ buflen -= ret;
+ mark += ret;
+
+ } else if (ret == 0) {
+ close(fd[0]);
+ buflen = 0;
+
+ } else {
+ close(fd[0]);
+ return ret;
+ }
+ }
+
+ /* execve verification */
rpid = waitpid(
pid,
&code,
0);
if ((rpid != pid) || code) {
- close(fd[0]);
- close(fd[1]);
+ errno = EBADR;
return -1;
}
- if ((fmachine = fdopen(fd[0],"r"))) {
- close(fd[1]);
- newline = 0;
-
- if (fgets(machine,bufsize,fmachine) == machine)
- if (!fgets(check,sizeof(check),fmachine))
- if (feof(fmachine))
- if ((newline = strrchr(machine,'\n')))
- *newline = 0;
-
- fclose(fmachine);
- } else {
- newline = 0;
- close(fd[0]);
- close(fd[1]);
+ /* newline verification */
+ if ((mark == machine) || (*--mark != '\n')) {
+ errno = EBADR;
+ return -1;
}
- /* support the portbld <--> unknown synonym */
- if (newline)
- if ((mark = strstr(machine,"-portbld-")))
- memcpy(mark,"-unknown",8);
+ *mark = 0;
+
+ /* portbld <--> unknown synonym? */
+ if ((mark = strstr(machine,"-portbld-")))
+ memcpy(mark,"-unknown",8);
- return newline ? 0 : -1;
+ /* all done */
+ return 0;
}