add -g (for custom group file) and -R (to mount as root) options

Sigrid Solveig Haflínudóttir committed 6 years ago

Commit 75bb5101 parent 3669b3e3 files · +30 −7Browse files

Unified · Split

3 files

 #pragma varargck type "M" Part*
 struct Opts {
+	char *group;
 	int cachewb;
 	int linkmode;
+	int asroot;
 };
 struct Part {

 		rerrstr(err, sizeof(err));
 		respond(r, err);
 	}else{
-		if(findgroup(&a->p->groups, r->ifcall.uname, &a->uid) == nil)
+		if(opts.asroot || findgroup(&a->p->groups, r->ifcall.uname, &a->uid) == nil)
-			a->uid = Root; /* FIXME need external mapping */
+			a->uid = Root;
 		incref(a->p);
 		a->type = Adir;
 static void
 usage(void)
 {
-	fprint(2, "usage: %s [-C] [-l hide] [-s srvname]\n", argv0);
+	fprint(2, "usage: %s [-C] [-R] [-g GROUPFILE] [-l hide] [-s SRVNAME]\n", argv0);
 	threadexitsall("usage");
 }
 void
 threadmain(int argc, char **argv)
 {
-	char *srv;
+	char *srv, *gr;
+	vlong sz;
+	int f;
 	srv = "ext4";
 	ARGBEGIN{
 	case 's':
 		srv = EARGF(usage());
 		break;
+	case 'g':
+		gr = EARGF(usage());
+		if((f = open(gr, OREAD)) < 0)
+			sysfatal("%r");
+		if((sz = seek(f, 0, 2)) < 0)
+			sysfatal("%s: invalid group file", gr);
+		if((opts.group = malloc(sz+1)) == nil)
+			sysfatal("memory");
+		seek(f, 0, 0);
+		if(readn(f, opts.group, sz) != sz)
+			sysfatal("%s: read failed", gr);
+		close(f);
+		opts.group[sz] = 0;
+		break;
+	case 'R':
+		opts.asroot = 1;
+		break;
 	}ARGEND
 	if(argc != 0)

 		goto error;
 	}
-	if((gr = readfile(p, "/etc/group", &sz)) != nil){
+	if(opts->group != nil){
+		r = loadgroups(&p->groups, opts->group);
+	}else if((gr = readfile(p, "/etc/group", &sz)) != nil){
 		gr[sz] = 0;
 		r = loadgroups(&p->groups, gr);
 		free(gr);
-		if(r != 0)
-			goto error;
 	}
+	if(r != 0)
+		goto error;
 	return 0;
 error:

Keyboard shortcuts