aboutsummaryrefslogtreecommitdiff
path: root/target/makedevs
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2005-06-24 07:26:33 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2005-06-24 07:26:33 +0000
commiteb0ee4509d3112d80cbb210b44fb682ba7033385 (patch)
tree54e5aafc886938962479f78fc7a43c5376777df2 /target/makedevs
parentafcdf8a01a2d54edb7a217f8c7c1e74e1fb8758b (diff)
downloadbuildroot-eb0ee4509d3112d80cbb210b44fb682ba7033385.tar.gz
buildroot-eb0ee4509d3112d80cbb210b44fb682ba7033385.tar.bz2
Finish implementing fakeroot handling so mksquashfs properly
inherits device table settings and device nodes, exactly as per mkfs* applications that support device tables natively.
Diffstat (limited to 'target/makedevs')
-rw-r--r--target/makedevs/makedevs.c58
-rw-r--r--target/makedevs/makedevs.mk7
2 files changed, 39 insertions, 26 deletions
diff --git a/target/makedevs/makedevs.c b/target/makedevs/makedevs.c
index d2b3a2a74b..bb3310761e 100644
--- a/target/makedevs/makedevs.c
+++ b/target/makedevs/makedevs.c
@@ -25,7 +25,9 @@
#include <pwd.h>
#include <grp.h>
#include <unistd.h>
+#include <ctype.h>
#include <errno.h>
+#include <libgen.h>
#include <stdarg.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -97,6 +99,13 @@ FILE *bb_xfopen(const char *path, const char *mode)
return fp;
}
+enum {
+ FILEUTILS_PRESERVE_STATUS = 1,
+ FILEUTILS_DEREFERENCE = 2,
+ FILEUTILS_RECUR = 4,
+ FILEUTILS_FORCE = 8,
+ FILEUTILS_INTERACTIVE = 16
+};
int bb_make_directory (char *path, long mode, int flags)
{
mode_t mask;
@@ -104,13 +113,6 @@ int bb_make_directory (char *path, long mode, int flags)
char *s = path;
char c;
struct stat st;
- enum {
- FILEUTILS_PRESERVE_STATUS = 1,
- FILEUTILS_DEREFERENCE = 2,
- FILEUTILS_RECUR = 4,
- FILEUTILS_FORCE = 8,
- FILEUTILS_INTERACTIVE = 16
- };
mask = umask(0);
if (mode == -1) {
@@ -325,20 +327,20 @@ int main(int argc, char **argv)
FILE *table = stdin;
char *rootdir = "./";
char *line;
+ int linenum = 0;
int ret = EXIT_SUCCESS;
- bb_applet_name = argv[0];
+ bb_applet_name = basename(argv[0]);
+ argc--;
+ argv++;
- while ((opt = getopt(argc, argv, "d:r:")) != -1) {
+ while ((opt = getopt(argc, argv, "d:")) != -1) {
switch(opt) {
case 'd':
table = bb_xfopen(optarg, "r");
break;
- case 'n':
- rootdir = optarg;
- break;
default:
- fprintf(stderr, "%s: [-r rootdir] [device_table]\n\n", bb_applet_name);
+ fprintf(stderr, "%s: [-d device_table] rootdir\n\n", bb_applet_name);
fprintf(stderr, "Creates a batch of special files as specified in a device table.\n");
fprintf(stderr, "Device table entries take the form of:\n");
fprintf(stderr, "type mode user group major minor start increment count\n\n");
@@ -370,8 +372,13 @@ int main(int argc, char **argv)
}
}
+ if (optind >= argc) {
+ bb_error_msg_and_die("root directory not speficied");
+ }
+ rootdir = argv[optind];
+
- if (chdir(rootdir) == -1) {
+ if (chdir(rootdir) != 0) {
bb_perror_msg_and_die("Couldnt chdir to %s", rootdir);
}
@@ -392,11 +399,16 @@ int main(int argc, char **argv)
uid_t uid;
gid_t gid;
+ linenum++;
+
if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", name,
&type, &mode, user, group, &major,
&minor, &start, &increment, &count)) ||
- ((major | minor | start | count | increment) > 255)) {
- bb_error_msg("Ignoring invalid line\n%s\n", line);
+ ((major | minor | start | count | increment) > 255))
+ {
+ if (*line=='\0' || *line=='#' || isspace(*line))
+ continue;
+ bb_error_msg("line %d invalid: '%s'\n", linenum, line);
ret = EXIT_FAILURE;
continue;
}
@@ -416,9 +428,9 @@ int main(int argc, char **argv)
full_name = concat_path_file(rootdir, name);
if (type == 'd') {
- bb_make_directory(full_name, mode | S_IFDIR, 0);
+ bb_make_directory(full_name, mode | S_IFDIR, FILEUTILS_RECUR);
if (chown(full_name, uid, gid) == -1) {
- bb_perror_msg("chown failed for %s", full_name);
+ bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
goto loop;
}
@@ -434,7 +446,7 @@ int main(int argc, char **argv)
else if (type == 'b') {
mode |= S_IFBLK;
} else {
- bb_error_msg("Unsupported file type %c", type);
+ bb_error_msg("line %d: Unsupported file type %c", linenum, type);
ret = EXIT_FAILURE;
goto loop;
}
@@ -448,11 +460,11 @@ int main(int argc, char **argv)
sprintf(full_name_inc, "%s%d", full_name, i);
rdev = (major << 8) + minor + (i * increment - start);
if (mknod(full_name_inc, mode, rdev) == -1) {
- bb_perror_msg("Couldnt create node %s", full_name_inc);
+ bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name_inc);
ret = EXIT_FAILURE;
}
else if (chown(full_name_inc, uid, gid) == -1) {
- bb_perror_msg("chown failed for %s", full_name_inc);
+ bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);
ret = EXIT_FAILURE;
}
}
@@ -460,11 +472,11 @@ int main(int argc, char **argv)
} else {
rdev = (major << 8) + minor;
if (mknod(full_name, mode, rdev) == -1) {
- bb_perror_msg("Couldnt create node %s", full_name);
+ bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name);
ret = EXIT_FAILURE;
}
else if (chown(full_name, uid, gid) == -1) {
- bb_perror_msg("chown failed for %s", full_name);
+ bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
}
}
diff --git a/target/makedevs/makedevs.mk b/target/makedevs/makedevs.mk
index cfc19d0ec5..620b0cdcd6 100644
--- a/target/makedevs/makedevs.mk
+++ b/target/makedevs/makedevs.mk
@@ -7,12 +7,13 @@
#############################################################
MAKEDEVS_DIR=$(BUILD_DIR)/makedevs
-$(MAKEDEVS_DIR)/makedevs.c:
+$(MAKEDEVS_DIR)/makedevs.c: target/makedevs/makedevs.c
+ rm -rf $(MAKEDEVS_DIR)
mkdir $(MAKEDEVS_DIR)
cp target/makedevs/makedevs.c $(MAKEDEVS_DIR)
-$(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)
- gcc -Wall -O2 makedevs.c -o makedevs
+$(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)/makedevs.c
+ gcc -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $(MAKEDEVS_DIR)/makedevs
touch -c $(MAKEDEVS_DIR)/makedevs
$(STAGING_DIR)/bin/makedevs: $(MAKEDEVS_DIR)/makedevs