Deleted Added
full compact
mount.c (213298) mount.c (221124)
1/*-
2 * Copyright (c) 1980, 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

32"@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
33 The Regents of the University of California. All rights reserved.\n";
34#if 0
35static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
36#endif
37#endif /* not lint */
38
39#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1980, 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

32"@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
33 The Regents of the University of California. All rights reserved.\n";
34#if 0
35static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
36#endif
37#endif /* not lint */
38
39#include <sys/cdefs.h>
40__FBSDID("$FreeBSD: head/sbin/mount/mount.c 213298 2010-09-30 13:31:35Z jh $");
40__FBSDID("$FreeBSD: head/sbin/mount/mount.c 221124 2011-04-27 17:51:51Z rmacklem $");
41
42#include <sys/param.h>
43#include <sys/mount.h>
44#include <sys/stat.h>
45#include <sys/wait.h>
46
47#include <ctype.h>
48#include <err.h>

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

136use_mountprog(const char *vfstype)
137{
138 /* XXX: We need to get away from implementing external mount
139 * programs for every filesystem, and move towards having
140 * each filesystem properly implement the nmount() system call.
141 */
142 unsigned int i;
143 const char *fs[] = {
41
42#include <sys/param.h>
43#include <sys/mount.h>
44#include <sys/stat.h>
45#include <sys/wait.h>
46
47#include <ctype.h>
48#include <err.h>

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

136use_mountprog(const char *vfstype)
137{
138 /* XXX: We need to get away from implementing external mount
139 * programs for every filesystem, and move towards having
140 * each filesystem properly implement the nmount() system call.
141 */
142 unsigned int i;
143 const char *fs[] = {
144 "cd9660", "mfs", "msdosfs", "newnfs", "nfs", "ntfs",
145 "nwfs", "nullfs", "portalfs", "smbfs", "udf", "unionfs",
144 "cd9660", "mfs", "msdosfs", "nfs", "ntfs",
145 "nwfs", "nullfs", "oldnfs", "portalfs", "smbfs", "udf", "unionfs",
146 NULL
147 };
148
149 if (mountprog != NULL)
150 return (1);
151
152 for (i = 0; fs[i] != NULL; ++i) {
153 if (strcmp(vfstype, fs[i]) == 0)

--- 772 unchanged lines hidden ---
146 NULL
147 };
148
149 if (mountprog != NULL)
150 return (1);
151
152 for (i = 0; fs[i] != NULL; ++i) {
153 if (strcmp(vfstype, fs[i]) == 0)

--- 772 unchanged lines hidden ---