aboutsummaryrefslogtreecommitdiffstats
path: root/src/fbuilder/build_fs.c
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2017-11-19 15:02:42 -0600
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2017-11-19 15:02:42 -0600
commitb936e5ab77dfa0b54b2f6f6dd53762a8244e4230 (patch)
treeedb7237ba54d7c2a85a8531c8901d6466c5e0e4d /src/fbuilder/build_fs.c
parentMore qtox profile tightening (diff)
downloadfirejail-b936e5ab77dfa0b54b2f6f6dd53762a8244e4230.tar.gz
firejail-b936e5ab77dfa0b54b2f6f6dd53762a8244e4230.tar.zst
firejail-b936e5ab77dfa0b54b2f6f6dd53762a8244e4230.zip
strip trailing whitespace
Diffstat (limited to 'src/fbuilder/build_fs.c')
-rw-r--r--src/fbuilder/build_fs.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index f1a27a35a..3f685623e 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -25,23 +25,23 @@ static void process_file(const char *fname, const char *dir, void (*callback)(ch
25 assert(fname); 25 assert(fname);
26 assert(dir); 26 assert(dir);
27 assert(callback); 27 assert(callback);
28 28
29 int dir_len = strlen(dir); 29 int dir_len = strlen(dir);
30 30
31 // process trace file 31 // process trace file
32 FILE *fp = fopen(fname, "r"); 32 FILE *fp = fopen(fname, "r");
33 if (!fp) { 33 if (!fp) {
34 fprintf(stderr, "Error: cannot open %s\n", fname); 34 fprintf(stderr, "Error: cannot open %s\n", fname);
35 exit(1); 35 exit(1);
36 } 36 }
37 37
38 char buf[MAX_BUF]; 38 char buf[MAX_BUF];
39 while (fgets(buf, MAX_BUF, fp)) { 39 while (fgets(buf, MAX_BUF, fp)) {
40 // remove \n 40 // remove \n
41 char *ptr = strchr(buf, '\n'); 41 char *ptr = strchr(buf, '\n');
42 if (ptr) 42 if (ptr)
43 *ptr = '\0'; 43 *ptr = '\0';
44 44
45 // parse line: 4:galculator:access /etc/fonts/conf.d:0 45 // parse line: 4:galculator:access /etc/fonts/conf.d:0
46 // number followed by : 46 // number followed by :
47 ptr = buf; 47 ptr = buf;
@@ -78,10 +78,10 @@ static void process_file(const char *fname, const char *dir, void (*callback)(ch
78 if (!ptr2) 78 if (!ptr2)
79 continue; 79 continue;
80 *ptr2 = '\0'; 80 *ptr2 = '\0';
81 81
82 callback(ptr); 82 callback(ptr);
83 } 83 }
84 84
85 fclose(fp); 85 fclose(fp);
86} 86}
87 87
@@ -90,10 +90,10 @@ static void process_files(const char *fname, const char *dir, void (*callback)(c
90 assert(fname); 90 assert(fname);
91 assert(dir); 91 assert(dir);
92 assert(callback); 92 assert(callback);
93 93
94 // run fname 94 // run fname
95 process_file(fname, dir, callback); 95 process_file(fname, dir, callback);
96 96
97 // run all the rest 97 // run all the rest
98 struct stat s; 98 struct stat s;
99 int i; 99 int i;
@@ -127,9 +127,9 @@ static void etc_callback(char *ptr) {
127 127
128void build_etc(const char *fname, FILE *fp) { 128void build_etc(const char *fname, FILE *fp) {
129 assert(fname); 129 assert(fname);
130 130
131 process_files(fname, "/etc", etc_callback); 131 process_files(fname, "/etc", etc_callback);
132 132
133 fprintf(fp, "private-etc "); 133 fprintf(fp, "private-etc ");
134 if (etc_out == NULL) 134 if (etc_out == NULL)
135 fprintf(fp, "none\n"); 135 fprintf(fp, "none\n");
@@ -140,7 +140,7 @@ void build_etc(const char *fname, FILE *fp) {
140 ptr = ptr->next; 140 ptr = ptr->next;
141 } 141 }
142 fprintf(fp, "\n"); 142 fprintf(fp, "\n");
143 } 143 }
144} 144}
145 145
146//******************************************* 146//*******************************************
@@ -164,7 +164,7 @@ void build_var(const char *fname, FILE *fp) {
164 assert(fname); 164 assert(fname);
165 165
166 process_files(fname, "/var", var_callback); 166 process_files(fname, "/var", var_callback);
167 167
168 if (var_out == NULL) 168 if (var_out == NULL)
169 fprintf(fp, "blacklist /var\n"); 169 fprintf(fp, "blacklist /var\n");
170 else 170 else
@@ -218,9 +218,9 @@ static void tmp_callback(char *ptr) {
218 218
219void build_tmp(const char *fname, FILE *fp) { 219void build_tmp(const char *fname, FILE *fp) {
220 assert(fname); 220 assert(fname);
221 221
222 process_files(fname, "/tmp", tmp_callback); 222 process_files(fname, "/tmp", tmp_callback);
223 223
224 if (tmp_out == NULL) 224 if (tmp_out == NULL)
225 fprintf(fp, "private-tmp\n"); 225 fprintf(fp, "private-tmp\n");
226 else { 226 else {
@@ -247,7 +247,7 @@ static char *dev_skip[] = {
247 "/dev/random", 247 "/dev/random",
248 "/dev/urandom", 248 "/dev/urandom",
249 "/dev/tty", 249 "/dev/tty",
250 "/dev/snd", 250 "/dev/snd",
251 "/dev/dri", 251 "/dev/dri",
252 "/dev/pts", 252 "/dev/pts",
253 "/dev/nvidia0", 253 "/dev/nvidia0",
@@ -296,9 +296,9 @@ static void dev_callback(char *ptr) {
296 296
297void build_dev(const char *fname, FILE *fp) { 297void build_dev(const char *fname, FILE *fp) {
298 assert(fname); 298 assert(fname);
299 299
300 process_files(fname, "/dev", dev_callback); 300 process_files(fname, "/dev", dev_callback);
301 301
302 if (dev_out == NULL) 302 if (dev_out == NULL)
303 fprintf(fp, "private-dev\n"); 303 fprintf(fp, "private-dev\n");
304 else { 304 else {