Deleted Added
full compact
utilities.c (70050) utilities.c (70166)
1/*
2 * Copyright (c) 1980, 1986, 1993
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by the University of
16 * California, Berkeley and its contributors.
17 * 4. Neither the name of the University nor the names of its contributors
18 * may be used to endorse or promote products derived from this software
19 * without specific prior written permission.
20 *
21 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
22 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#ifndef lint
35#if 0
36static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
37#endif
38static const char rcsid[] =
1/*
2 * Copyright (c) 1980, 1986, 1993
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by the University of
16 * California, Berkeley and its contributors.
17 * 4. Neither the name of the University nor the names of its contributors
18 * may be used to endorse or promote products derived from this software
19 * without specific prior written permission.
20 *
21 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
22 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#ifndef lint
35#if 0
36static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
37#endif
38static const char rcsid[] =
39 "$FreeBSD: head/sbin/fsck_ffs/utilities.c 70050 2000-12-15 14:23:55Z iedowse $";
39 "$FreeBSD: head/sbin/fsck_ffs/utilities.c 70166 2000-12-18 21:14:25Z phk $";
40#endif /* not lint */
41
42#include <sys/param.h>
43#include <sys/types.h>
44#include <sys/stat.h>
45
46#include <ufs/ufs/dinode.h>
47#include <ufs/ufs/dir.h>
48#include <ufs/ffs/fs.h>
49
50#include <err.h>
51#include <errno.h>
52#include <string.h>
53#include <ctype.h>
54#include <fstab.h>
55#include <stdio.h>
56#include <stdlib.h>
57#include <unistd.h>
58
59#include "fsck.h"
60
61
62char *
63blockcheck(origname)
64 char *origname;
65{
66 struct stat stslash, stblock, stchar;
67 char *newname, *raw;
68 struct fstab *fsinfo;
69 int retried = 0, len;
70
71 newname = origname;
72retry:
73 if (stat(newname, &stblock) < 0) {
74 printf("Can't stat %s: %s\n", newname, strerror(errno));
75 return (origname);
76 }
77 switch(stblock.st_mode & S_IFMT) {
78 case S_IFCHR:
79 case S_IFBLK:
80 return(newname);
81 case S_IFDIR:
82 if (retried)
83 break;
84
85 len = strlen(origname) - 1;
86 if (len > 0 && origname[len] == '/')
87 /* remove trailing slash */
88 origname[len] = '\0';
89 if ((fsinfo = getfsfile(origname)) == NULL) {
40#endif /* not lint */
41
42#include <sys/param.h>
43#include <sys/types.h>
44#include <sys/stat.h>
45
46#include <ufs/ufs/dinode.h>
47#include <ufs/ufs/dir.h>
48#include <ufs/ffs/fs.h>
49
50#include <err.h>
51#include <errno.h>
52#include <string.h>
53#include <ctype.h>
54#include <fstab.h>
55#include <stdio.h>
56#include <stdlib.h>
57#include <unistd.h>
58
59#include "fsck.h"
60
61
62char *
63blockcheck(origname)
64 char *origname;
65{
66 struct stat stslash, stblock, stchar;
67 char *newname, *raw;
68 struct fstab *fsinfo;
69 int retried = 0, len;
70
71 newname = origname;
72retry:
73 if (stat(newname, &stblock) < 0) {
74 printf("Can't stat %s: %s\n", newname, strerror(errno));
75 return (origname);
76 }
77 switch(stblock.st_mode & S_IFMT) {
78 case S_IFCHR:
79 case S_IFBLK:
80 return(newname);
81 case S_IFDIR:
82 if (retried)
83 break;
84
85 len = strlen(origname) - 1;
86 if (len > 0 && origname[len] == '/')
87 /* remove trailing slash */
88 origname[len] = '\0';
89 if ((fsinfo = getfsfile(origname)) == NULL) {
90 printf("Can't resolve %s to character special device",
90 printf(
91 "Can't resolve %s to character special device.\n",
91 origname);
92 return (0);
93 }
94 newname = fsinfo->fs_spec;
95 retried++;
96 goto retry;
97 }
98 /*
99 * Not a block or character device, just return name and
100 * let the user decide whether to use it.
101 */
102 return (origname);
103}
104
105void
106infohandler(sig)
107 int sig;
108{
109 got_siginfo = 1;
110}
92 origname);
93 return (0);
94 }
95 newname = fsinfo->fs_spec;
96 retried++;
97 goto retry;
98 }
99 /*
100 * Not a block or character device, just return name and
101 * let the user decide whether to use it.
102 */
103 return (origname);
104}
105
106void
107infohandler(sig)
108 int sig;
109{
110 got_siginfo = 1;
111}