summaryrefslogtreecommitdiff
path: root/sbin/raidctl
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>1999-08-07 23:48:11 +0000
committeroster <oster@NetBSD.org>1999-08-07 23:48:11 +0000
commit180bbfd87149d648d96fdcd2b4458f0112c43ba7 (patch)
tree7aa59a35bb147081e282df9326293a62713ff68c /sbin/raidctl
parent38de172f030dc6977cec79fe6ce7d9a320b4179c (diff)
Move two functions from rf_strutils.c into rf_configure.c, removing
the need for rf_strutils.c.
Diffstat (limited to 'sbin/raidctl')
-rw-r--r--sbin/raidctl/Makefile4
-rw-r--r--sbin/raidctl/rf_configure.c22
2 files changed, 22 insertions, 4 deletions
diff --git a/sbin/raidctl/Makefile b/sbin/raidctl/Makefile
index ee303cbf9d3..1dba2108ed3 100644
--- a/sbin/raidctl/Makefile
+++ b/sbin/raidctl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 1999/03/26 00:46:05 oster Exp $
+# $NetBSD: Makefile,v 1.6 1999/08/07 23:48:11 oster Exp $
PROG= raidctl
-SRCS= rf_configure.c rf_layout.c rf_strutils.c raidctl.c
+SRCS= rf_configure.c rf_layout.c raidctl.c
MAN= raidctl.8
LOOKHERE = ${.CURDIR}/../../sys/dev/raidframe
diff --git a/sbin/raidctl/rf_configure.c b/sbin/raidctl/rf_configure.c
index d5f177ce38b..7558c219561 100644
--- a/sbin/raidctl/rf_configure.c
+++ b/sbin/raidctl/rf_configure.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_configure.c,v 1.6 1999/03/26 00:45:01 oster Exp $ */
+/* $NetBSD: rf_configure.c,v 1.7 1999/08/07 23:48:11 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -54,7 +54,6 @@
#include <sys/stat.h>
#include "rf_raid.h"
#include "rf_raidframe.h"
-#include "rf_utils.h"
#include "rf_general.h"
#include "rf_decluster.h"
#include "rf_configure.h"
@@ -79,6 +78,9 @@ that file here in userland.. GO
bzero((char *)_p_, _size_); \
}
+char *rf_find_non_white(char *p);
+char *rf_find_white(char *p);
+
static int rf_search_file_for_start_of(char *string, char *buf, int len,
@@ -346,6 +348,22 @@ int rf_MakeLayoutSpecificDeclustered(configfp, cfgPtr, arg)
*
***************************************************************************/
+/* finds a non-white character in the line */
+char *
+rf_find_non_white(char *p)
+{
+ for (; *p != '\0' && (*p == ' ' || *p == '\t'); p++);
+ return (p);
+}
+
+/* finds a white character in the line */
+char *
+rf_find_white(char *p)
+{
+ for (; *p != '\0' && (*p != ' ' && *p != '\t'); p++);
+ return (p);
+}
+
/* searches a file for a line that says "START string", where string is
* specified as a parameter
*/