ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

strutils: add skip_space() function 

[kzak@redhat.com: - add also skip_blank(),
                  - remove duplicate implementation from libmount]

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Ondrej Oprala 2013-09-23 15:39:34 +02:00 committed by Karel Zak
parent d01d144c4b
commit 675de3f5c1
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/strutils.h
View File

@ -5,6 +5,7 @@
#include <inttypes.h>
#include <string.h>
#include <sys/types.h>
#include <ctype.h>
/* default strtoxx_or_err() exit code */
#ifndef STRTOXX_EXIT_CODE
@ -143,4 +144,21 @@ static inline const char *endswith(const char *s, const char *postfix)
return (char *)s + sl - pl;
}
/*
* Skip leading white space.
*/
static inline const char *skip_space(const char *p)
{
while (isspace(*p))
++p;
return p;
}
static inline const char *skip_blank(const char *p)
{
while (isblank(*p))
++p;
return p;
}
#endif

17
libmount/src/tab_parse.c
View File

@ -22,15 +22,6 @@
#include "pathnames.h"
#include "strutils.h"
static inline char *skip_spaces(char *s)
{
assert(s);
while (*s == ' ' || *s == '\t')
s++;
return s;
}
static int next_number(char **s, int *num)
{
char *end = NULL;
@ -38,7 +29,7 @@ static int next_number(char **s, int *num)
assert(num);
assert(s);
*s = skip_spaces(*s);
*s = (char *) skip_blank(*s);
if (!**s)
return -1;
*num = strtol(*s, &end, 10);
@ -111,7 +102,7 @@ static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
fs->passno = fs->freq = 0;
if (xrc == 4 && n)
s = skip_spaces(s + n);
s = (char *) skip_blank(s + n);
if (xrc == 4 && *s) {
if (next_number(&s, &fs->freq) != 0) {
if (*s) {
@ -346,7 +337,7 @@ static int guess_table_format(char *line)
static int is_comment_line(char *line)
{
char *p = skip_spaces(line);
char *p = (char *) skip_blank(line);
if (p && (*p == '#' || *p == '\n'))
return 1;
@ -474,7 +465,7 @@ next_line:
*s = '\0';
if (--s >= buf && *s == '\r')
*s = '\0';
s = skip_spaces(buf);
s = (char *) skip_blank(buf);
} while (*s == '\0' || *s == '#');
if (tb->fmt == MNT_FMT_GUESS) {