| mount_unionfs.c (26071) | mount_unionfs.c (28629) |
|---|---|
| 1/* 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software donated to Berkeley by 6 * Jan-Simon Pendry. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 21 unchanged lines hidden (view full) --- 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 */ 36 37#ifndef lint | 1/* 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software donated to Berkeley by 6 * Jan-Simon Pendry. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 21 unchanged lines hidden (view full) --- 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 */ 36 37#ifndef lint |
| 38char copyright[] = | 38static const char copyright[] = |
| 39"@(#) Copyright (c) 1992, 1993, 1994\n\ 40 The Regents of the University of California. All rights reserved.\n"; 41#endif /* not lint */ 42 43#ifndef lint | 39"@(#) Copyright (c) 1992, 1993, 1994\n\ 40 The Regents of the University of California. All rights reserved.\n"; 41#endif /* not lint */ 42 43#ifndef lint |
| 44#if 0 |
|
| 44static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; | 45static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; |
| 46#else 47static const char rcsid[] = 48 "$Id$"; 49#endif |
|
| 45#endif /* not lint */ 46 47#include <sys/param.h> 48#include <sys/mount.h> 49 50#include <miscfs/union/union.h> 51 52#include <err.h> --- 69 unchanged lines hidden (view full) --- 122 err(EX_OSERR, "vfsload(union)"); 123 endvfsent(); /* flush cache */ 124 error = getvfsbyname("union", &vfc); 125 } 126 if (error) 127 errx(EX_OSERR, "union filesystem is not available"); 128 129 if (mount(vfc.vfc_name, source, mntflags, &args)) | 50#endif /* not lint */ 51 52#include <sys/param.h> 53#include <sys/mount.h> 54 55#include <miscfs/union/union.h> 56 57#include <err.h> --- 69 unchanged lines hidden (view full) --- 127 err(EX_OSERR, "vfsload(union)"); 128 endvfsent(); /* flush cache */ 129 error = getvfsbyname("union", &vfc); 130 } 131 if (error) 132 errx(EX_OSERR, "union filesystem is not available"); 133 134 if (mount(vfc.vfc_name, source, mntflags, &args)) |
| 130 err(EX_OSERR, target); | 135 err(EX_OSERR, "%s", target); |
| 131 exit(0); 132} 133 134int 135subdir(p, dir) 136 const char *p; 137 const char *dir; 138{ --- 19 unchanged lines hidden --- | 136 exit(0); 137} 138 139int 140subdir(p, dir) 141 const char *p; 142 const char *dir; 143{ --- 19 unchanged lines hidden --- |