shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

Indent spaces to tabs

Browse Source
This commit is contained in:
Zdenek Kabelac 2011-03-10 14:47:22 +00:00
parent 442dbf9ad8
commit 1092ae2dbe
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
test/lib/harness.c
View File

@ -44,8 +44,8 @@ static int die = 0;
static int verbose = 0; static int verbose = 0;
struct subst { struct subst {
const char *key; const char *key;
char *value; char *value;
}; };
static struct subst subst[2]; static struct subst subst[2];
@ -62,52 +62,52 @@ static void handler( int sig ) {
} }
static int outline(char *buf, int start, int force) { static int outline(char *buf, int start, int force) {
char *from = buf + start; char *from = buf + start;
char *next = strchr(buf + start, '\n'); char *next = strchr(buf + start, '\n');
if (!next && !force) /* not a complete line yet... */ if (!next && !force) /* not a complete line yet... */
return start; return start;
if (!next) if (!next)
next = from + strlen(from); next = from + strlen(from);
else else
++next; ++next;
if (!strncmp(from, "@TESTDIR=", 9)) { if (!strncmp(from, "@TESTDIR=", 9)) {
subst[0].key = "@TESTDIR@"; subst[0].key = "@TESTDIR@";
subst[0].value = strndup(from + 9, next - from - 9 - 1); subst[0].value = strndup(from + 9, next - from - 9 - 1);
} else if (!strncmp(from, "@PREFIX=", 8)) { } else if (!strncmp(from, "@PREFIX=", 8)) {
subst[1].key = "@PREFIX@"; subst[1].key = "@PREFIX@";
subst[1].value = strndup(from + 8, next - from - 8 - 1); subst[1].value = strndup(from + 8, next - from - 8 - 1);
} else { } else {
char *line = strndup(from, next - from); char *line = strndup(from, next - from);
char *a = line, *b; char *a = line, *b;
do { do {
int idx = -1; int idx = -1;
int i; int i;
b = line + strlen(line); b = line + strlen(line);
for ( i = 0; i < 2; ++i ) { for ( i = 0; i < 2; ++i ) {
if (subst[i].key) { if (subst[i].key) {
// printf("trying: %s -> %s\n", subst[i].value, subst[i].key); // printf("trying: %s -> %s\n", subst[i].value, subst[i].key);
char *stop = strstr(a, subst[i].value); char *stop = strstr(a, subst[i].value);
if (stop && stop < b) { if (stop && stop < b) {
idx = i; idx = i;
b = stop; b = stop;
} }
} }
} }
fwrite(a, 1, b - a, stdout); fwrite(a, 1, b - a, stdout);
a = b; a = b;
if ( idx >= 0 ) { if ( idx >= 0 ) {
fprintf(stdout, "%s", subst[idx].key); fprintf(stdout, "%s", subst[idx].key);
a += strlen(subst[idx].value); a += strlen(subst[idx].value);
} }
} while (b < line + strlen(line)); } while (b < line + strlen(line));
free(line); free(line);
} }
return next - buf + (force ? 0 : 1); return next - buf + (force ? 0 : 1);
} }
static void dump(void) { static void dump(void) {
@ -126,7 +126,7 @@ static void clear(void) {
static void drain(void) { static void drain(void) {
int sz; int sz;
char buf[2048]; char buf[2048];
memset(buf, 0, 2048); memset(buf, 0, 2048);
while (1) { while (1) {
sz = read(fds[1], buf, 2047); sz = read(fds[1], buf, 2047);
@ -195,8 +195,8 @@ static void run(int i, char *f) {
close(0); close(0);
dup2(fds[0], 1); dup2(fds[0], 1);
dup2(fds[0], 2); dup2(fds[0], 2);
close(fds[0]); close(fds[0]);
close(fds[1]); close(fds[1]);
execlp("bash", "bash", f, NULL); execlp("bash", "bash", f, NULL);
perror("execlp"); perror("execlp");
fflush(stderr); fflush(stderr);
@ -257,11 +257,11 @@ int main(int argc, char **argv) {
} }
/* set up signal handlers */ /* set up signal handlers */
for (i = 0; i <= 32; ++i) { for (i = 0; i <= 32; ++i) {
if (i == SIGCHLD || i == SIGWINCH || i == SIGURG) if (i == SIGCHLD || i == SIGWINCH || i == SIGURG)
continue; continue;
signal(i, handler); signal(i, handler);
} }
/* run the tests */ /* run the tests */
for (i = 1; i < argc; ++ i) { for (i = 1; i < argc; ++ i) {