emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mountinfo: create strings with xasprintf

Browse Source
This commit is contained in:
William Hubbs 2018-02-14 16:56:19 -06:00
parent 74cfb455c5
commit 7b4879cb72
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rc/mountinfo.c
View File

@ -248,7 +248,6 @@ find_mounts(struct args *args)
struct opt *o; struct opt *o;
int netdev; int netdev;
char *tmp; char *tmp;
size_t l;
if ((nmnts = getmntinfo(&mnts, MNT_NOWAIT)) == 0) if ((nmnts = getmntinfo(&mnts, MNT_NOWAIT)) == 0)
eerrorx("getmntinfo: %s", strerror (errno)); eerrorx("getmntinfo: %s", strerror (errno));
@ -264,11 +263,7 @@ find_mounts(struct args *args)
if (! options) if (! options)
options = xstrdup(o->o_name); options = xstrdup(o->o_name);
else { else {
l = strlen(options) + xasprintf(&tmp, "%s,%s", options, o->o_name);
strlen(o->o_name) + 2;
tmp = xmalloc(sizeof (char) * l);
snprintf(tmp, l, "%s,%s", options,
o->o_name);
free(options); free(options);
options = tmp; options = tmp;
} }
@ -315,6 +310,7 @@ find_mounts(struct args *args)
{ {
FILE *fp; FILE *fp;
char *buffer; char *buffer;
size_t size;
char *p; char *p;
char *from; char *from;
char *to; char *to;
@ -329,8 +325,8 @@ find_mounts(struct args *args)
list = rc_stringlist_new(); list = rc_stringlist_new();
buffer = xmalloc(sizeof(char) * PATH_MAX * 3); buffer = NULL;
while (fgets(buffer, PATH_MAX * 3, fp)) { while (getline(&buffer, &size, fp) != -1) {
netdev = -1; netdev = -1;
p = buffer; p = buffer;
from = strsep(&p, " "); from = strsep(&p, " ");
@ -346,6 +342,8 @@ find_mounts(struct args *args)
} }
process_mount(list, args, from, to, fst, opts, netdev); process_mount(list, args, from, to, fst, opts, netdev);
free(buffer);
buffer = NULL;
} }
free(buffer); free(buffer);
fclose(fp); fclose(fp);
@ -380,7 +378,7 @@ int main(int argc, char **argv)
regex_t *skip_point_regex = NULL; regex_t *skip_point_regex = NULL;
RC_STRINGLIST *nodes; RC_STRINGLIST *nodes;
RC_STRING *s; RC_STRING *s;
char real_path[PATH_MAX + 1]; char *real_path = NULL;
int opt; int opt;
int result; int result;
char *this_path; char *this_path;
@ -450,9 +448,12 @@ int main(int argc, char **argv)
eerrorx("%s: `%s' is not a mount point", eerrorx("%s: `%s' is not a mount point",
argv[0], argv[optind]); argv[0], argv[optind]);
this_path = argv[optind++]; this_path = argv[optind++];
if (realpath(this_path, real_path)) real_path = realpath(this_path, NULL);
if (real_path)
this_path = real_path; this_path = real_path;
rc_stringlist_add(args.mounts, this_path); rc_stringlist_add(args.mounts, this_path);
free(real_path);
real_path = NULL;
} }
nodes = find_mounts(&args); nodes = find_mounts(&args);
rc_stringlist_free(args.mounts); rc_stringlist_free(args.mounts);