int excludeCtr;
int errors;
int verbose; /* getopt32 uses it, has to be int */
- //smallint force;
- //smallint progress;
- //smallint debug;
- //smallint dry_run;
- //smallint quiet;
- //smallint ignore_enoent;
- //smallint take_log;
- //smallint warn_no_match;
smallint recurse; /* Recursive descent */
smallint follow_mounts;
/* Behavior flags determined based on setfiles vs. restorecon */
#define excludeCtr (G.excludeCtr )
#define errors (G.errors )
#define verbose (G.verbose )
-//#define force (G.force )
-//#define progress (G.progress )
-//#define debug (G.debug )
-//#define dry_run (G.dry_run )
-//#define quiet (G.quiet )
-//#define ignore_enoent (G.ignore_enoent )
-//#define take_log (G.take_log )
-//#define warn_no_match (G.warn_no_match )
#define recurse (G.recurse )
#define follow_mounts (G.follow_mounts )
#define expand_realpath (G.expand_realpath )
}
}
-static bool add_exclude(const char *const directory)
+static void add_exclude(const char *const directory)
{
struct stat sb;
size_t len;
if (directory == NULL || directory[0] != '/') {
- bb_error_msg("full path required for exclude: %s", directory);
- return 1;
+ bb_error_msg_and_die("full path required for exclude: %s", directory);
+
}
if (lstat(directory, &sb)) {
bb_error_msg("directory \"%s\" not found, ignoring", directory);
- return 0;
+ return;
}
if ((sb.st_mode & S_IFDIR) == 0) {
bb_error_msg("\"%s\" is not a directory: mode %o, ignoring",
directory, sb.st_mode);
- return 0;
+ return;
}
if (excludeCtr == MAX_EXCLUDES) {
- bb_error_msg("maximum excludes %d exceeded", MAX_EXCLUDES);
- return 1;
+ bb_error_msg_and_die("maximum excludes %d exceeded", MAX_EXCLUDES);
}
len = strlen(directory);
}
excludeArray[excludeCtr].directory = xstrndup(directory, len);
excludeArray[excludeCtr++].size = len;
-
- return 0;
}
static bool exclude(const char *file)
file_sep = strrchr(tmp_path, '/');
if (file_sep == tmp_path) {
file_sep++;
- p[0] = '\0';
+ path[0] = '\0';
p = path;
} else if (file_sep) {
*file_sep++ = '\0';
static int restore(const char *file)
{
- char *my_file = xstrdup(file);
- char *my_file_orig = my_file;
+ char *my_file;
struct stat my_sb;
int i, j, ret;
char *context = NULL;
char *newcon = NULL;
bool user_only_changed = 0;
- size_t len = strlen(my_file);
int retval = 0;
- /* Skip the extra slashes at the beginning and end, if present. */
- if (file[0] == '/' && file[1] == '/')
- my_file++;
- if (len > 1 && my_file[len - 1] == '/')
- my_file[len - 1] = '\0';
+ my_file = bb_simplify_path(file);
i = match(my_file, &my_sb, &newcon);
if (i < 0) /* No matching specification. */
goto out;
-
if (FLAG_p_progress) {
count++;
if (count % 0x400 == 0) { /* every 1024 times */
count = (count % (80*0x400));
if (count == 0)
- fputc('\n', stdout);
- fputc('*', stdout);
+ bb_putchar('\n');
+ bb_putchar('*');
fflush(stdout);
}
}
out:
freecon(context);
freecon(newcon);
- free(my_file_orig);
+ free(my_file);
return retval;
err:
retval--; /* -1 */
static int canoncon(const char *path, unsigned lineno, char **contextp)
{
- static const char err_msg[] = "%s: line %u has invalid context %s";
+ static const char err_msg[] ALIGN1 = "%s: line %u has invalid context %s";
char *tmpcon;
char *context = *contextp;
goto out;
}
-int setfiles_main(int argc, char **argv);
+int setfiles_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int setfiles_main(int argc, char **argv)
{
struct stat sb;
int rc, i = 0;
const char *input_filename = NULL;
- int use_input_file = 0;
char *buf = NULL;
size_t buf_len;
int flags;
opt_complementary = "e::vv:v--p:p--v:v--q:q--v";
/* Option order must match OPT_x definitions! */
if (applet_name[0] == 'r') { /* restorecon */
- flags = getopt32(argc, argv, "de:f:ilnpqrsvo:FWR",
+ flags = getopt32(argv, "de:f:ilnpqrsvo:FWR",
&exclude_dir, &input_filename, &out_filename, &verbose);
} else { /* setfiles */
- flags = getopt32(argc, argv, "de:f:ilnpqr:svo:FW"
+ flags = getopt32(argv, "de:f:ilnpqr:svo:FW"
USE_FEATURE_SETFILES_CHECK_OPTION("c:"),
&exclude_dir, &input_filename, &rootpath, &out_filename,
USE_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
}
#endif
- //if (flags & OPT_d) {
- // debug = 1;
- //}
- if (flags & OPT_e) {
- if (exclude_dir == NULL) {
- bb_show_usage();
- }
- while (exclude_dir) {
- if (add_exclude(llist_pop(&exclude_dir)))
- exit(1);
- }
- }
- //if (flags & OPT_i) {
- // ignore_enoent = 1;
- //}
- //if (flags & OPT_l) {
- // take_log = 1;
- //}
- //if (flags & OPT_F) {
- // force = 1;
- //}
- //if (flags & OPT_n) {
- // dry_run = 1;
- //}
+ while (exclude_dir)
+ add_exclude(llist_pop(&exclude_dir));
+
if (flags & OPT_o) {
outfile = stdout;
if (NOT_LONE_CHAR(out_filename, '-')) {
outfile = xfopen(out_filename, "w");
}
}
- //if (flags & OPT_q) {
- // quiet = 1;
- //}
if (applet_name[0] == 'r') { /* restorecon */
if (flags & (OPT_r | OPT_R))
recurse = 1;
rootpathlen = strlen(rootpath);
}
if (flags & OPT_s) {
- use_input_file = 1;
input_filename = "-";
add_assoc = 0;
}
- //if (flags & OPT_p) {
- // progress = 1;
- //}
- //if (flags & OPT_W) {
- // warn_no_match = 1;
- //}
if (applet_name[0] == 's') { /* setfiles */
/* Use our own invalid context checking function so that
if (argc == 1)
bb_show_usage();
if (stat(argv[optind], &sb) < 0) {
- bb_perror_msg_and_die("%s", argv[optind]);
+ bb_simple_perror_msg_and_die(argv[optind]);
}
if (!S_ISREG(sb.st_mode)) {
bb_error_msg_and_die("spec file %s is not a regular file", argv[optind]);
/* Load the file contexts configuration and check it. */
rc = matchpathcon_init(argv[optind]);
if (rc < 0) {
- bb_perror_msg_and_die("%s", argv[optind]);
+ bb_simple_perror_msg_and_die(argv[optind]);
}
optind++;
exit(1);
}
- if (use_input_file) {
+ if (input_filename) {
ssize_t len;
FILE *f = stdin;
projects / oweals / busybox.git / blobdiff