Deleted Added
sdiff udiff text old ( 185422 ) new ( 201227 )
full compact
mount_msdosfs.c (185422) mount_msdosfs.c (201227)
1/* $NetBSD: mount_msdos.c,v 1.18 1997/09/16 12:24:18 lukem Exp $ */
2
3/*
4 * Copyright (c) 1994 Christopher G. Demetriou
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 18 unchanged lines hidden (view full) ---

27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#ifndef lint
34static const char rcsid[] =
1/* $NetBSD: mount_msdos.c,v 1.18 1997/09/16 12:24:18 lukem Exp $ */
2
3/*
4 * Copyright (c) 1994 Christopher G. Demetriou
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 18 unchanged lines hidden (view full) ---

27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#ifndef lint
34static const char rcsid[] =
35 "$FreeBSD: head/sbin/mount_msdosfs/mount_msdosfs.c 185422 2008-11-29 02:28:05Z imp $";
35 "$FreeBSD: head/sbin/mount_msdosfs/mount_msdosfs.c 201227 2009-12-29 22:53:27Z ed $";
36#endif /* not lint */
37
38#include <sys/param.h>
39#include <sys/mount.h>
40#include <sys/stat.h>
41#include <sys/iconv.h>
42#include <sys/linker.h>
43#include <sys/module.h>

--- 180 unchanged lines hidden (view full) ---

224 else
225 err(1, "%s", dev);
226 }
227
228 exit (0);
229}
230
231gid_t
36#endif /* not lint */
37
38#include <sys/param.h>
39#include <sys/mount.h>
40#include <sys/stat.h>
41#include <sys/iconv.h>
42#include <sys/linker.h>
43#include <sys/module.h>

--- 180 unchanged lines hidden (view full) ---

224 else
225 err(1, "%s", dev);
226 }
227
228 exit (0);
229}
230
231gid_t
232a_gid(s)
233 char *s;
232a_gid(char *s)
234{
235 struct group *gr;
236 char *gname;
237 gid_t gid;
238
239 if ((gr = getgrnam(s)) != NULL)
240 gid = gr->gr_gid;
241 else {
242 for (gname = s; *s && isdigit(*s); ++s);
243 if (!*s)
244 gid = atoi(gname);
245 else
246 errx(EX_NOUSER, "unknown group id: %s", gname);
247 }
248 return (gid);
249}
250
251uid_t
233{
234 struct group *gr;
235 char *gname;
236 gid_t gid;
237
238 if ((gr = getgrnam(s)) != NULL)
239 gid = gr->gr_gid;
240 else {
241 for (gname = s; *s && isdigit(*s); ++s);
242 if (!*s)
243 gid = atoi(gname);
244 else
245 errx(EX_NOUSER, "unknown group id: %s", gname);
246 }
247 return (gid);
248}
249
250uid_t
252a_uid(s)
253 char *s;
251a_uid(char *s)
254{
255 struct passwd *pw;
256 char *uname;
257 uid_t uid;
258
259 if ((pw = getpwnam(s)) != NULL)
260 uid = pw->pw_uid;
261 else {
262 for (uname = s; *s && isdigit(*s); ++s);
263 if (!*s)
264 uid = atoi(uname);
265 else
266 errx(EX_NOUSER, "unknown user id: %s", uname);
267 }
268 return (uid);
269}
270
271mode_t
252{
253 struct passwd *pw;
254 char *uname;
255 uid_t uid;
256
257 if ((pw = getpwnam(s)) != NULL)
258 uid = pw->pw_uid;
259 else {
260 for (uname = s; *s && isdigit(*s); ++s);
261 if (!*s)
262 uid = atoi(uname);
263 else
264 errx(EX_NOUSER, "unknown user id: %s", uname);
265 }
266 return (uid);
267}
268
269mode_t
272a_mask(s)
273 char *s;
270a_mask(char *s)
274{
275 int done, rv;
276 char *ep;
277
278 done = 0;
279 rv = -1;
280 if (*s >= '0' && *s <= '7') {
281 done = 1;
282 rv = strtol(optarg, &ep, 8);
283 }
284 if (!done || rv < 0 || *ep)
285 errx(EX_USAGE, "invalid file mode: %s", s);
286 return (rv);
287}
288
289void
271{
272 int done, rv;
273 char *ep;
274
275 done = 0;
276 rv = -1;
277 if (*s >= '0' && *s <= '7') {
278 done = 1;
279 rv = strtol(optarg, &ep, 8);
280 }
281 if (!done || rv < 0 || *ep)
282 errx(EX_USAGE, "invalid file mode: %s", s);
283 return (rv);
284}
285
286void
290usage()
287usage(void)
291{
292 fprintf(stderr, "%s\n%s\n%s\n",
293 "usage: mount_msdosfs [-9ls] [-D DOS_codepage] [-g gid] [-L locale]",
294 " [-M mask] [-m mask] [-o options] [-u uid]",
295 " [-W table] special node");
296 exit(EX_USAGE);
297}
298

--- 29 unchanged lines hidden --- 		288{
289 fprintf(stderr, "%s\n%s\n%s\n",
290 "usage: mount_msdosfs [-9ls] [-D DOS_codepage] [-g gid] [-L locale]",
291 " [-M mask] [-m mask] [-o options] [-u uid]",
292 " [-W table] special node");
293 exit(EX_USAGE);
294}
295

--- 29 unchanged lines hidden ---