 @@ -1,14 +1,14 @@
-.\"     $NetBSD: p2k.3,v 1.9 2011/01/07 15:50:40 pooka Exp $
+.\"     $NetBSD: p2k.3,v 1.10 2011/01/07 16:02:32 pooka Exp $
 .\"
 .\" Copyright (c) 2008 Antti Kantee.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 @@ -108,30 +108,28 @@ Sending
 causes a dump of all the vnodes (verbose).
 .It Dv P2K_NODETACH
 Do not detach from tty.
 .It Dv P2K_NOCACHE_PAGE
 Do not use the puffs page cache.
 .It Dv P2K_NOCACHE_NAME
 Do not use the puffs name cache.
 .It Dv P2K_NOCACHE
 Do not use the puffs page or name cache.
 .It Dv P2K_WIZARDUID
 If set, use the value of the variable to determine the UID of the
 caller of each operation instead of the actual caller supplied by
 .Xr puffs 3 .
-This can be used for example to simplify modifying an OS installations
+This can be used for example to simplify modifying an OS installation's
 root image as a non-root user.
 If the variable is set but does not contain an integer value, 0
 (root) is used.
 .El
 .Sh SEE ALSO
 .Xr puffs 3 ,
 .Xr rump 3 ,
 .Xr ukfs 3 ,
 .Xr rump_cd9660 8 ,
 .Xr rump_efs 8 ,
 .Xr rump_ext2fs 8 ,
 .Xr rump_ffs 8 ,
 .Xr rump_hfs 8 ,
 .Xr rump_lfs 8 ,
 .Xr rump_msdos 8 ,
 .Xr rump_nfs 8 ,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: p2k.c,v 1.53 2011/01/07 15:47:14 pooka Exp $	*/
+/*	$NetBSD: p2k.c,v 1.54 2011/01/07 16:02:32 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -334,30 +334,37 @@ p2k_init(uint32_t puffs_flags)
 	if (getenv("P2K_NODETACH") != NULL) {
 		dodaemon = false;
+	}
 	if (getenv("P2K_NOCACHE_PAGE") != NULL) {
 		puffs_flags |= PUFFS_KFLAG_NOCACHE_PAGE;
+	}
 	if (getenv("P2K_NOCACHE_NAME") != NULL) {
 		puffs_flags |= PUFFS_KFLAG_NOCACHE_NAME;
+	}
 	if (getenv("P2K_NOCACHE") != NULL) {
 		puffs_flags |= PUFFS_KFLAG_NOCACHE;
+	}
 	if ((envbuf = getenv("P2K_WIZARDUID")) != NULL) {
-		/* default to 0 in error cases */
+		char *ep;
 		wizarduid = atoi(envbuf);
-		haswizard = 1;
+		wizarduid = strtoul(envbuf, &ep, 10);
-		printf("P2K WIZARD MODE: using uid %d\n", wizarduid);
+		if (envbuf[0] == '\0' || *ep != '\0') {
 			printf("P2K_WIZARDUID: invalid uid %s\n", envbuf);
 		} else if (wizarduid > UID_MAX) {
 			printf("P2K_WIZARDUID: uid %s out-of-range\n", envbuf);
 		} else {
 			haswizard = 1;
 			printf("P2K WIZARD MODE: using uid %d\n", wizarduid);
+		}
+	}
 	p2m = allocp2m();
 	if (p2m == NULL)
 		return NULL;
 	p2m->p2m_pu = puffs_init(pops, PUFFS_DEFER, PUFFS_DEFER,
 	    PUFFS_DEFER, puffs_flags);
 	if (p2m->p2m_pu == NULL) {
 		int sverrno = errno;
 		free(p2m);
 		errno = sverrno;
 		return NULL;
+	}