diff options
Diffstat (limited to 'collage')
| -rw-r--r-- | collage/Makefile | 4 | ||||
| -rw-r--r-- | collage/commands.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/collage/Makefile b/collage/Makefile index 596204d8c..a6cc14339 100644 --- a/collage/Makefile +++ b/collage/Makefile @@ -1,6 +1,6 @@ -CFLAGS = -Wall -g -I/usr/include/rpm +CFLAGS = -Wall -g LDFLAGS = -g -LOADLIBES = -L../isys -lz -lisys -lresolv -lrpm -lbz2 -lpopt +LOADLIBES = -L../isys -lz -lisys -lresolv -lpopt all: collage diff --git a/collage/commands.c b/collage/commands.c index d57df39dd..02a142adc 100644 --- a/collage/commands.c +++ b/collage/commands.c @@ -183,6 +183,7 @@ int mknodCommand(int argc, char ** argv) { if (*end == '/') end++; if (devMakeInode(end, path)) { + printf("failed to make inode for device %s\n", end); return 1; } @@ -308,19 +309,17 @@ int chmodCommand(int argc, char ** argv) { return 0; } -#define CPIOERR_CHECK_ERRNO 0x00008000 - int uncpioCommand(int argc, char ** argv) { int rc; const char * fail; - FD_t cfd; + gzFile cfd; if (argc != 1) { fprintf(stderr, "uncpio reads from stdin"); return 1; } - cfd = Fdopen(fdDup(0), "r.gzdio"); + cfd = gzdopen(0, "r"); rc = cpioInstallArchive(cfd, NULL, 0, NULL, NULL, &fail); |