a0dc2079d2
These were mainly missing casts or wrong format strings in printf statements, but there were also missing includes, unused variables, functions and arguments. The choice of `long' vs `int' still seems almost random in a lot of places though.
122 lines
3.4 KiB
C
122 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 1980, 1986, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef lint
|
|
#if 0
|
|
static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
|
|
#endif
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif /* not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <ufs/ufs/dinode.h>
|
|
#include <ufs/ufs/dir.h>
|
|
#include <ufs/ffs/fs.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
#include <fstab.h>
|
|
#include <paths.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#include "fsck.h"
|
|
|
|
|
|
char *
|
|
blockcheck(origname)
|
|
char *origname;
|
|
{
|
|
struct stat stblock;
|
|
char *newname, *cp;
|
|
struct fstab *fsinfo;
|
|
int retried = 0, len;
|
|
static char device[MAXPATHLEN];
|
|
|
|
newname = origname;
|
|
if (stat(newname, &stblock) < 0) {
|
|
cp = strrchr(newname, '/');
|
|
if (cp == 0) {
|
|
(void)snprintf(device, sizeof(device), "%s%s",
|
|
_PATH_DEV, newname);
|
|
newname = device;
|
|
}
|
|
}
|
|
retry:
|
|
if (stat(newname, &stblock) < 0) {
|
|
printf("Can't stat %s: %s\n", newname, strerror(errno));
|
|
return (origname);
|
|
}
|
|
switch(stblock.st_mode & S_IFMT) {
|
|
case S_IFCHR:
|
|
case S_IFBLK:
|
|
return(newname);
|
|
case S_IFDIR:
|
|
if (retried)
|
|
break;
|
|
|
|
len = strlen(origname) - 1;
|
|
if (len > 0 && origname[len] == '/')
|
|
/* remove trailing slash */
|
|
origname[len] = '\0';
|
|
if ((fsinfo = getfsfile(origname)) == NULL) {
|
|
printf(
|
|
"Can't resolve %s to character special device.\n",
|
|
origname);
|
|
return (origname);
|
|
}
|
|
newname = fsinfo->fs_spec;
|
|
retried++;
|
|
goto retry;
|
|
}
|
|
/*
|
|
* Not a block or character device, just return name and
|
|
* let the user decide whether to use it.
|
|
*/
|
|
return (origname);
|
|
}
|
|
|
|
void
|
|
infohandler(sig)
|
|
int sig;
|
|
{
|
|
got_siginfo = 1;
|
|
}
|