summaryrefslogtreecommitdiffstats
path: root/sbin/fsck/fsutil.c
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2003-12-27 13:29:49 +0000
committerbde <bde@FreeBSD.org>2003-12-27 13:29:49 +0000
commite73943dcf62db248f2c939919e842d98bbf1e305 (patch)
treea30f45aeccc4500ea4c6612d773ab357cbb001db /sbin/fsck/fsutil.c
parentccf8fdfdee138f695e756c0143be5acec5debb93 (diff)
downloadFreeBSD-src-e73943dcf62db248f2c939919e842d98bbf1e305.zip
FreeBSD-src-e73943dcf62db248f2c939919e842d98bbf1e305.tar.gz
Garbage-collected hotroot, rawname() and unrawname() again. These
became garbage when block devices were axed and were removed a few months later, but they came back (with hotroot renamed to hot + hotroot()) when the NetBSD fsck was mismerged.
Diffstat (limited to 'sbin/fsck/fsutil.c')
-rw-r--r--sbin/fsck/fsutil.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index b77eeeb..8599b0f 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include "fsutil.h"
static const char *dev = NULL;
-static int hot = 0;
static int preen = 0;
static void vmsg(int, const char *, va_list) __printflike(2, 0);
@@ -73,12 +72,6 @@ cdevname(void)
return dev;
}
-int
-hotroot(void)
-{
- return hot;
-}
-
static void
vmsg(int fatal, const char *fmt, va_list ap)
{
@@ -138,37 +131,6 @@ panic(const char *fmt, ...)
}
const char *
-unrawname(const char *name)
-{
- static char unrawbuf[32];
- const char *dp;
- struct stat stb;
-
- if ((dp = strrchr(name, '/')) == 0)
- return (name);
- if (stat(name, &stb) < 0)
- return (name);
- if (!S_ISCHR(stb.st_mode))
- return (name);
- if (dp[1] != 'r')
- return (name);
- (void)snprintf(unrawbuf, 32, "%.*s/%s", (int)(dp - name), name, dp + 2);
- return (unrawbuf);
-}
-
-const char *
-rawname(const char *name)
-{
- static char rawbuf[32];
- const char *dp;
-
- if ((dp = strrchr(name, '/')) == 0)
- return (0);
- (void)snprintf(rawbuf, 32, "%.*s/r%s", (int)(dp - name), name, dp + 1);
- return (rawbuf);
-}
-
-const char *
devcheck(const char *origname)
{
struct stat stslash, stchar;
OpenPOWER on IntegriCloud