Attachment #82271 for bug #117687

View | Details | Raw Unified | Return to bug 117687
Collapse All | Expand All

Lines 49-54 Link Here

(-)fstab.c (+5 lines)
49	#include <stdlib.h>	49	#include <stdlib.h>
50	#include <string.h>	50	#include <string.h>
51	#include <unistd.h>	51	#include <unistd.h>
		52	#include <vis.h>
52	#include "un-namespace.h"	53	#include "un-namespace.h"
53		54
54	static FILE *_fs_fp;	55	static FILE *_fs_fp;
Lines 155-163 Link Here
155	_fs_fstab.fs_spec = cp;	156	_fs_fstab.fs_spec = cp;
156	if (!_fs_fstab.fs_spec \|\| *_fs_fstab.fs_spec == '#')	157	if (!_fs_fstab.fs_spec \|\| *_fs_fstab.fs_spec == '#')
157	continue;	158	continue;
		159	if (strunvis(cp, cp) <= 0)
		160	goto bad;
158	while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')	161	while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
159	;	162	;
160	_fs_fstab.fs_file = cp;	163	_fs_fstab.fs_file = cp;
		164	if (strunvis(cp, cp) <= 0)
		165	goto bad;
161	fixfsfile();	166	fixfsfile();
162	while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')	167	while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
163	;	168	;




.\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.26 2004/07/03 18:29:22 ru Exp $
.\"
.Dd October 29, 2007
.Dt FSTAB 5
.Os
.Sh NAME

.Pp
The first field,
.Pq Fa fs_spec ,
describes the special device or
remote file system to be mounted.
For file systems of type
.Em ufs ,
the special file name is the block special file name,
and not the character special file name.
If a program needs the character special file name,
the program must create it by appending a ``r'' after the
last ``/'' in the special file name.
.Pp
The second field,
.Pq Fa fs_file ,
describes the mount point for the file system.
For swap partitions, this field should be specified as ``none''.
.Pp
The first and second field are decoded with the
.Xr strunvis 3
function, therefore spaces in the mount point path can be escaped as
.Ql \e040
\&.
.Pp
The third field,
.Pq Fa fs_vfstype ,
describes the type of the file system.

#define	FSTAB_XX	"xx"	/* ignore totally */

struct fstab {
	char	*fs_spec;	/* special device name */
	char	*fs_file;	/* file system path prefix */
	char	*fs_vfstype;	/* File system type, ufs, nfs */
	char	*fs_mntops;	/* Mount options ala -o */

.Xr mount 8 ,
.Xr quotacheck 8 ,
.Xr quotaon 8 ,
.Xr strunvis 3 ,
.Xr swapon 8 ,
.Xr umount 8
.Sh HISTORY

Return to bug 117687

Lines 32-38 Link Here

(-)fstab.5 (-10 / +10 lines)
32	.\" @(#)fstab.5 8.1 (Berkeley) 6/5/93	32	.\" @(#)fstab.5 8.1 (Berkeley) 6/5/93
33	.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.26 2004/07/03 18:29:22 ru Exp $	33	.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.26 2004/07/03 18:29:22 ru Exp $
34	.\"	34	.\"
35	.Dd June 5, 1993	35	.Dd October 29, 2007
36	.Dt FSTAB 5	36	.Dt FSTAB 5
37	.Os	37	.Os
38	.Sh NAME	38	.Sh NAME
Lines 64-84 Link Here
64	.Pp	64	.Pp
65	The first field,	65	The first field,
66	.Pq Fa fs_spec ,	66	.Pq Fa fs_spec ,
67	describes the block special device or	67	describes the special device or
68	remote file system to be mounted.	68	remote file system to be mounted.
69	For file systems of type
70	.Em ufs ,
71	the special file name is the block special file name,
72	and not the character special file name.
73	If a program needs the character special file name,
74	the program must create it by appending a ``r'' after the
75	last ``/'' in the special file name.
76	.Pp	69	.Pp
77	The second field,	70	The second field,
78	.Pq Fa fs_file ,	71	.Pq Fa fs_file ,
79	describes the mount point for the file system.	72	describes the mount point for the file system.
80	For swap partitions, this field should be specified as ``none''.	73	For swap partitions, this field should be specified as ``none''.
81	.Pp	74	.Pp
		75	The first and second field are decoded with the
		76	.Xr strunvis 3
		77	function, therefore spaces in the mount point path can be escaped as
		78	.Ql \e040
		79	\&.
		80	.Pp
82	The third field,	81	The third field,
83	.Pq Fa fs_vfstype ,	82	.Pq Fa fs_vfstype ,
84	describes the type of the file system.	83	describes the type of the file system.
Lines 208-214 Link Here
208	#define FSTAB_XX "xx" /* ignore totally */	207	#define FSTAB_XX "xx" /* ignore totally */
209		208
210	struct fstab {	209	struct fstab {
211	char fs_spec; / block special device name */	210	char fs_spec; / special device name */
212	char fs_file; / file system path prefix */	211	char fs_file; / file system path prefix */
213	char fs_vfstype; / File system type, ufs, nfs */	212	char fs_vfstype; / File system type, ufs, nfs */
214	char fs_mntops; / Mount options ala -o */	213	char fs_mntops; / Mount options ala -o */
Lines 242-247 Link Here
242	.Xr mount 8 ,	241	.Xr mount 8 ,
243	.Xr quotacheck 8 ,	242	.Xr quotacheck 8 ,
244	.Xr quotaon 8 ,	243	.Xr quotaon 8 ,
		244	.Xr strunvis 3 ,
245	.Xr swapon 8 ,	245	.Xr swapon 8 ,
246	.Xr umount 8	246	.Xr umount 8
247	.Sh HISTORY	247	.Sh HISTORY