diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/extract_caps.c | 18 | ||||
-rw-r--r-- | src/tools/extract_syscalls.c | 16 | ||||
-rwxr-xr-x | src/tools/mkcoverit.sh | 2 | ||||
-rw-r--r-- | src/tools/rvtest.c | 20 | ||||
-rw-r--r-- | src/tools/unixsocket.c | 4 |
5 files changed, 30 insertions, 30 deletions
diff --git a/src/tools/extract_caps.c b/src/tools/extract_caps.c index 66d86e1a6..b33fdf61f 100644 --- a/src/tools/extract_caps.c +++ b/src/tools/extract_caps.c | |||
@@ -29,14 +29,14 @@ int main(int argc, char **argv) { | |||
29 | printf("usage: %s /usr/include/linux/capability.h\n", argv[0]); | 29 | printf("usage: %s /usr/include/linux/capability.h\n", argv[0]); |
30 | return 1; | 30 | return 1; |
31 | } | 31 | } |
32 | 32 | ||
33 | //open file | 33 | //open file |
34 | FILE *fp = fopen(argv[1], "r"); | 34 | FILE *fp = fopen(argv[1], "r"); |
35 | if (!fp) { | 35 | if (!fp) { |
36 | fprintf(stderr, "Error: cannot open file\n"); | 36 | fprintf(stderr, "Error: cannot open file\n"); |
37 | return 1; | 37 | return 1; |
38 | } | 38 | } |
39 | 39 | ||
40 | // read file | 40 | // read file |
41 | char buf[BUFMAX]; | 41 | char buf[BUFMAX]; |
42 | while (fgets(buf, BUFMAX, fp)) { | 42 | while (fgets(buf, BUFMAX, fp)) { |
@@ -47,12 +47,12 @@ int main(int argc, char **argv) { | |||
47 | char *end = strchr(start, '\n'); | 47 | char *end = strchr(start, '\n'); |
48 | if (end) | 48 | if (end) |
49 | *end = '\0'; | 49 | *end = '\0'; |
50 | 50 | ||
51 | // parsing | 51 | // parsing |
52 | if (strncmp(start, "#define CAP_", 12) == 0) { | 52 | if (strncmp(start, "#define CAP_", 12) == 0) { |
53 | if (strstr(start, "CAP_LAST_CAP")) | 53 | if (strstr(start, "CAP_LAST_CAP")) |
54 | break; | 54 | break; |
55 | 55 | ||
56 | char *ptr1 = start + 8; | 56 | char *ptr1 = start + 8; |
57 | char *ptr2 = ptr1; | 57 | char *ptr2 = ptr1; |
58 | while (*ptr2 == ' ' || *ptr2 == '\t') | 58 | while (*ptr2 == ' ' || *ptr2 == '\t') |
@@ -60,7 +60,7 @@ int main(int argc, char **argv) { | |||
60 | while (*ptr2 != ' ' && *ptr2 != '\t') | 60 | while (*ptr2 != ' ' && *ptr2 != '\t') |
61 | ptr2++; | 61 | ptr2++; |
62 | *ptr2 = '\0'; | 62 | *ptr2 = '\0'; |
63 | 63 | ||
64 | ptr2 = strdup(ptr1); | 64 | ptr2 = strdup(ptr1); |
65 | assert(ptr2); | 65 | assert(ptr2); |
66 | ptr2 += 4; | 66 | ptr2 += 4; |
@@ -69,14 +69,14 @@ int main(int argc, char **argv) { | |||
69 | *ptr3 = tolower(*ptr3); | 69 | *ptr3 = tolower(*ptr3); |
70 | ptr3++; | 70 | ptr3++; |
71 | } | 71 | } |
72 | 72 | ||
73 | 73 | ||
74 | printf("#ifdef %s\n", ptr1); | 74 | printf("#ifdef %s\n", ptr1); |
75 | printf("\t{\"%s\", %s },\n", ptr2, ptr1); | 75 | printf("\t{\"%s\", %s },\n", ptr2, ptr1); |
76 | printf("#endif\n"); | 76 | printf("#endif\n"); |
77 | 77 | ||
78 | } | 78 | } |
79 | 79 | ||
80 | } | 80 | } |
81 | fclose(fp); | 81 | fclose(fp); |
82 | return 0; | 82 | return 0; |
diff --git a/src/tools/extract_syscalls.c b/src/tools/extract_syscalls.c index 9af24b8cd..4dad0d2b6 100644 --- a/src/tools/extract_syscalls.c +++ b/src/tools/extract_syscalls.c | |||
@@ -28,14 +28,14 @@ int main(int argc, char **argv) { | |||
28 | printf("usage: %s /usr/include/x86_64-linux-gnu/bits/syscall.h\n", argv[0]); | 28 | printf("usage: %s /usr/include/x86_64-linux-gnu/bits/syscall.h\n", argv[0]); |
29 | return 1; | 29 | return 1; |
30 | } | 30 | } |
31 | 31 | ||
32 | //open file | 32 | //open file |
33 | FILE *fp = fopen(argv[1], "r"); | 33 | FILE *fp = fopen(argv[1], "r"); |
34 | if (!fp) { | 34 | if (!fp) { |
35 | fprintf(stderr, "Error: cannot open file\n"); | 35 | fprintf(stderr, "Error: cannot open file\n"); |
36 | return 1; | 36 | return 1; |
37 | } | 37 | } |
38 | 38 | ||
39 | // read file | 39 | // read file |
40 | char buf[BUFMAX]; | 40 | char buf[BUFMAX]; |
41 | while (fgets(buf, BUFMAX, fp)) { | 41 | while (fgets(buf, BUFMAX, fp)) { |
@@ -46,7 +46,7 @@ int main(int argc, char **argv) { | |||
46 | char *end = strchr(start, '\n'); | 46 | char *end = strchr(start, '\n'); |
47 | if (end) | 47 | if (end) |
48 | *end = '\0'; | 48 | *end = '\0'; |
49 | 49 | ||
50 | // parsing | 50 | // parsing |
51 | if (strncmp(start, "# error", 7) == 0) | 51 | if (strncmp(start, "# error", 7) == 0) |
52 | continue; | 52 | continue; |
@@ -66,7 +66,7 @@ int main(int argc, char **argv) { | |||
66 | return 1; | 66 | return 1; |
67 | } | 67 | } |
68 | *(ptr2 - 1) = '\0'; | 68 | *(ptr2 - 1) = '\0'; |
69 | 69 | ||
70 | char *ptr3 = ptr1; | 70 | char *ptr3 = ptr1; |
71 | while (*ptr3 != ' ' && *ptr3 != '\t' && *ptr3 != '\0') | 71 | while (*ptr3 != ' ' && *ptr3 != '\t' && *ptr3 != '\0') |
72 | ptr3++; | 72 | ptr3++; |
@@ -75,17 +75,17 @@ int main(int argc, char **argv) { | |||
75 | while (*ptr3 != ' ' && *ptr3 != '\t' && *ptr3 != '\0') | 75 | while (*ptr3 != ' ' && *ptr3 != '\t' && *ptr3 != '\0') |
76 | ptr3++; | 76 | ptr3++; |
77 | *ptr3 = '\0'; | 77 | *ptr3 = '\0'; |
78 | 78 | ||
79 | ptr3 = ptr1; | 79 | ptr3 = ptr1; |
80 | while (*ptr3 != '_') | 80 | while (*ptr3 != '_') |
81 | ptr3++; | 81 | ptr3++; |
82 | ptr3++; | 82 | ptr3++; |
83 | 83 | ||
84 | printf("#ifdef %s\n", ptr1); | 84 | printf("#ifdef %s\n", ptr1); |
85 | printf("#ifdef %s\n", ptr2); | 85 | printf("#ifdef %s\n", ptr2); |
86 | printf("\t{\"%s\", %s},\n", ptr3, ptr2); | 86 | printf("\t{\"%s\", %s},\n", ptr3, ptr2); |
87 | printf("#endif\n"); | 87 | printf("#endif\n"); |
88 | printf("#endif\n"); | 88 | printf("#endif\n"); |
89 | } | 89 | } |
90 | } | 90 | } |
91 | fclose(fp); | 91 | fclose(fp); |
diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh index 65b06f9fa..d4a68e397 100755 --- a/src/tools/mkcoverit.sh +++ b/src/tools/mkcoverit.sh | |||
@@ -29,7 +29,7 @@ then | |||
29 | pwd | 29 | pwd |
30 | ./configure --prefix=/usr | 30 | ./configure --prefix=/usr |
31 | cd .. | 31 | cd .. |
32 | 32 | ||
33 | else | 33 | else |
34 | echo "Error: firetools source archive missing" | 34 | echo "Error: firetools source archive missing" |
35 | exit 1 | 35 | exit 1 |
diff --git a/src/tools/rvtest.c b/src/tools/rvtest.c index d108672d2..3432ab9b4 100644 --- a/src/tools/rvtest.c +++ b/src/tools/rvtest.c | |||
@@ -64,7 +64,7 @@ int main(int argc, char **argv) { | |||
64 | // open test file | 64 | // open test file |
65 | char *fname = argv[1]; | 65 | char *fname = argv[1]; |
66 | FILE *fp = fopen(fname, "r"); | 66 | FILE *fp = fopen(fname, "r"); |
67 | 67 | ||
68 | // read test file | 68 | // read test file |
69 | char buf[MAXBUF]; | 69 | char buf[MAXBUF]; |
70 | int line = 0; | 70 | int line = 0; |
@@ -80,22 +80,22 @@ int main(int argc, char **argv) { | |||
80 | *ptr ='\0'; | 80 | *ptr ='\0'; |
81 | if (*start == '\0') | 81 | if (*start == '\0') |
82 | continue; | 82 | continue; |
83 | 83 | ||
84 | // skip comments | 84 | // skip comments |
85 | if (*start == '#') | 85 | if (*start == '#') |
86 | continue; | 86 | continue; |
87 | ptr = strchr(start, '#'); | 87 | ptr = strchr(start, '#'); |
88 | if (ptr) | 88 | if (ptr) |
89 | *ptr = '\0'; | 89 | *ptr = '\0'; |
90 | 90 | ||
91 | // extract exit status | 91 | // extract exit status |
92 | int status; | 92 | int status; |
93 | int rv = sscanf(start, "%d\n", &status); | 93 | int rv = sscanf(start, "%d\n", &status); |
94 | if (rv != 1) { | 94 | if (rv != 1) { |
95 | fprintf(stderr, "Error: invalid line %d in %s\n", line, fname); | 95 | fprintf(stderr, "Error: invalid line %d in %s\n", line, fname); |
96 | exit(1); | 96 | exit(1); |
97 | } | 97 | } |
98 | 98 | ||
99 | // extract command | 99 | // extract command |
100 | char *cmd = strchr(start, ' '); | 100 | char *cmd = strchr(start, ' '); |
101 | if (!cmd) { | 101 | if (!cmd) { |
@@ -124,21 +124,21 @@ int main(int argc, char **argv) { | |||
124 | // parent | 124 | // parent |
125 | else { | 125 | else { |
126 | int exit_status; | 126 | int exit_status; |
127 | 127 | ||
128 | alarm(TIMEOUT); | 128 | alarm(TIMEOUT); |
129 | pid = waitpid(pid, &exit_status, 0); | 129 | pid = waitpid(pid, &exit_status, 0); |
130 | if (pid == -1) { | 130 | if (pid == -1) { |
131 | perror("waitpid"); | 131 | perror("waitpid"); |
132 | exit(1); | 132 | exit(1); |
133 | } | 133 | } |
134 | 134 | ||
135 | if (WEXITSTATUS(exit_status) != status) | 135 | if (WEXITSTATUS(exit_status) != status) |
136 | printf("ERROR TESTING: %s\n", cmd); | 136 | printf("ERROR TESTING: %s\n", cmd); |
137 | } | 137 | } |
138 | 138 | ||
139 | fflush(0); | 139 | fflush(0); |
140 | } | 140 | } |
141 | fclose(fp); | 141 | fclose(fp); |
142 | 142 | ||
143 | return 0; | 143 | return 0; |
144 | } \ No newline at end of file | 144 | } |
diff --git a/src/tools/unixsocket.c b/src/tools/unixsocket.c index 88475ea3e..c4302eed3 100644 --- a/src/tools/unixsocket.c +++ b/src/tools/unixsocket.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #include <stdio.h> | 1 | #include <stdio.h> |
2 | #include <sys/types.h> | 2 | #include <sys/types.h> |
3 | #include <sys/socket.h> | 3 | #include <sys/socket.h> |
4 | #include <sys/un.h> | 4 | #include <sys/un.h> |
5 | 5 | ||
@@ -21,7 +21,7 @@ int main(void) { | |||
21 | fprintf(stderr, "Error: cannot connect to socket\n"); | 21 | fprintf(stderr, "Error: cannot connect to socket\n"); |
22 | return 1; | 22 | return 1; |
23 | } | 23 | } |
24 | 24 | ||
25 | printf("connected to %s\n", socketpath); | 25 | printf("connected to %s\n", socketpath); |
26 | close(s); | 26 | close(s); |
27 | 27 | ||