mirrors/libfuse
0
0
Fork 0
mirror of https://github.com/libfuse/libfuse.git synced 2024-11-23 12:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Miklos Szeredi 2005-01-15 09:42:01 +00:00
parent cdae16e0ae
commit 5ef2a9bd07
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-01-13 Miklos Szeredi <miklos@szeredi.hu>
* fusermount: improve parsing of /etc/fuse.conf
2005-01-13 Miklos Szeredi <miklos@szeredi.hu>
* Remove 'mount_max' and 'user_allow_other' module options. These

36
util/fusermount.c
View File

@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
@ -343,25 +344,48 @@ static int unmount_fuse(const char *mnt, int quiet, int lazy)
}
#endif /* USE_UCLIBC */
static void strip_line(char *line)
{
char *s = strchr(line, '#');
if (s != NULL)
s[0] = '\0';
for (s = line + strlen(line) - 1; s >= line && isspace((unsigned char) *s); s--);
s[1] = '\0';
for (s = line; isspace((unsigned char) *s); s++);
if (s != line)
memmove(line, s, strlen(s)+1);
}
static void read_conf(void)
{
FILE *fp = fopen(FUSE_CONF, "r");
if (fp != NULL) {
int linenum = 1;
char line[256];
int isnewline = 1;
while (fgets(line, sizeof(line), fp) != NULL) {
if (isnewline) {
if (line[strlen(line)-1] == '\n') {
int tmp;
if (strcmp(line, "user_allow_other\n") == 0)
strip_line(line);
if (strcmp(line, "user_allow_other") == 0)
user_allow_other = 1;
else if (sscanf(line, "mount_max = %i\n", &tmp) == 1)
else if (sscanf(line, "mount_max = %i", &tmp) == 1)
mount_max = tmp;
}
if(line[strlen(line)-1] == '\n')
isnewline = 1;
else
else if(line[0])
fprintf(stderr, "%s: unknown parameter in %s at line %i: '%s'\n",
progname, FUSE_CONF, linenum, line);
} else {
fprintf(stderr, "%s: reading %s: line %i too long\n",
progname, FUSE_CONF, linenum);
isnewline = 0;
}
} else if(line[strlen(line)-1] == '\n')
isnewline = 1;
if (isnewline)
linenum ++;
}
fclose(fp);
} else if (errno != ENOENT) {
fprintf(stderr, "%s: failed to open %s: %s\n", progname, FUSE_CONF,