code-style: whitespace fixes
This commit is contained in:
parent
51009a9600
commit
53be158979
@ -87,12 +87,12 @@ cp(const char *s1, const char *s2, int depth)
|
||||
continue;
|
||||
|
||||
estrlcpy(ns1, s1, sizeof(ns1));
|
||||
if(s1[strlen(s1) - 1] != '/')
|
||||
if (s1[strlen(s1) - 1] != '/')
|
||||
estrlcat(ns1, "/", sizeof(ns1));
|
||||
estrlcat(ns1, d->d_name, sizeof(ns1));
|
||||
|
||||
estrlcpy(ns2, s2, sizeof(ns2));
|
||||
if(s2[strlen(s2) - 1] != '/')
|
||||
if (s2[strlen(s2) - 1] != '/')
|
||||
estrlcat(ns2, "/", sizeof(ns2));
|
||||
estrlcat(ns2, d->d_name, sizeof(ns2));
|
||||
|
||||
|
@ -1,21 +1,23 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <regex.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
int
|
||||
enregcomp(int status, regex_t *preg, const char *regex, int cflags)
|
||||
{
|
||||
char errbuf[BUFSIZ] = "";
|
||||
int r;
|
||||
char errbuf[BUFSIZ] = "";
|
||||
int r;
|
||||
|
||||
if((r = regcomp(preg, regex, cflags)) == 0)
|
||||
return r;
|
||||
if ((r = regcomp(preg, regex, cflags)) == 0)
|
||||
return r;
|
||||
|
||||
regerror(r, preg, errbuf, sizeof(errbuf));
|
||||
enprintf(status, "invalid regex: %s\n", errbuf);
|
||||
return r;
|
||||
regerror(r, preg, errbuf, sizeof(errbuf));
|
||||
enprintf(status, "invalid regex: %s\n", errbuf);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int
|
||||
|
@ -28,7 +28,11 @@
|
||||
char *
|
||||
strcasestr(const char *h, const char *n)
|
||||
{
|
||||
size_t l = strlen(n);
|
||||
for (; *h; h++) if (!strncasecmp(h, n, l)) return (char *)h;
|
||||
return 0;
|
||||
size_t l = strlen(n);
|
||||
|
||||
for (; *h; h++)
|
||||
if (!strncasecmp(h, n, l))
|
||||
return (char *)h;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
3
ls.c
3
ls.c
@ -28,7 +28,7 @@ struct entry {
|
||||
static struct {
|
||||
dev_t dev;
|
||||
ino_t ino;
|
||||
} tree[PATH_MAX] = { { 0, 0 } };
|
||||
} tree[PATH_MAX];
|
||||
|
||||
static int Aflag = 0;
|
||||
static int aflag = 0;
|
||||
@ -307,6 +307,7 @@ visit(const struct entry *ent)
|
||||
|
||||
tree[i].ino = ino;
|
||||
tree[i].dev = dev;
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
|
2
sed.c
2
sed.c
@ -1329,7 +1329,7 @@ cmd_l(Cmd *c)
|
||||
printf("%s", escapes[(unsigned int)*p]);
|
||||
rlen = 1;
|
||||
} else if (!(rlen = charntorune(&r, p, end - p))) {
|
||||
/* ran out of chars, print the bytes of the short sequence */
|
||||
/* ran out of chars, print the bytes of the short sequence */
|
||||
for (; p < end; p++)
|
||||
printf("\\%03hho", (unsigned char)*p);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user