| mount_unionfs.c (164875) | mount_unionfs.c (165788) |
|---|---|
| 1/*- 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. 4 * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc. 5 * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org> 6 * All rights reserved. 7 * 8 * This code is derived from software donated to Berkeley by --- 30 unchanged lines hidden (view full) --- 39 The Regents of the University of California. All rights reserved.\n"; 40#endif /* not lint */ 41 42#ifndef lint 43#if 0 44static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; 45#else 46static const char rcsid[] = | 1/*- 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. 4 * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc. 5 * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org> 6 * All rights reserved. 7 * 8 * This code is derived from software donated to Berkeley by --- 30 unchanged lines hidden (view full) --- 39 The Regents of the University of California. All rights reserved.\n"; 40#endif /* not lint */ 41 42#ifndef lint 43#if 0 44static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; 45#else 46static const char rcsid[] = |
| 47 "$FreeBSD: head/sbin/mount_unionfs/mount_unionfs.c 164875 2006-12-04 14:05:42Z maxim $"; | 47 "$FreeBSD: head/sbin/mount_unionfs/mount_unionfs.c 165788 2007-01-05 02:54:27Z rodrigc $"; |
| 48#endif 49#endif /* not lint */ 50 51#include <sys/param.h> 52#include <sys/mount.h> 53#include <sys/uio.h> 54#include <sys/errno.h> 55 --- 90 unchanged lines hidden (view full) --- 146 build_iovec(&iov, &iovlen, "below", NULL, 0); 147 break; 148 case 'o': 149 p = strchr(optarg, '='); 150 val = NULL; 151 if (p != NULL) { 152 *p = '\0'; 153 val = p + 1; | 48#endif 49#endif /* not lint */ 50 51#include <sys/param.h> 52#include <sys/mount.h> 53#include <sys/uio.h> 54#include <sys/errno.h> 55 --- 90 unchanged lines hidden (view full) --- 146 build_iovec(&iov, &iovlen, "below", NULL, 0); 147 break; 148 case 'o': 149 p = strchr(optarg, '='); 150 val = NULL; 151 if (p != NULL) { 152 *p = '\0'; 153 val = p + 1; |
| 154 if (strncmp(optarg, "gid", 3) == 0) { | 154 if (strcmp(optarg, "gid") == 0) { |
| 155 parse_gid(val, gid_str, sizeof(gid_str)); 156 val = gid_str; 157 } | 155 parse_gid(val, gid_str, sizeof(gid_str)); 156 val = gid_str; 157 } |
| 158 else if (strncmp(optarg, "uid", 3) == 0) { | 158 else if (strcmp(optarg, "uid") == 0) { |
| 159 parse_uid(val, uid_str, sizeof(uid_str)); 160 val = uid_str; 161 } 162 } 163 build_iovec(&iov, &iovlen, optarg, val, (size_t)-1); 164 break; 165 case '?': 166 default: --- 27 unchanged lines hidden --- | 159 parse_uid(val, uid_str, sizeof(uid_str)); 160 val = uid_str; 161 } 162 } 163 build_iovec(&iov, &iovlen, optarg, val, (size_t)-1); 164 break; 165 case '?': 166 default: --- 27 unchanged lines hidden --- |