Rev 3346 | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3346 | Rev 3366 | ||
---|---|---|---|
1 | /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
1 | /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
2 | * All rights reserved. |
2 | * All rights reserved. |
3 | * |
3 | * |
4 | * Redistribution and use in source and binary forms, with or without |
4 | * Redistribution and use in source and binary forms, with or without |
5 | * modification, are permitted provided that the following conditions are met: |
5 | * modification, are permitted provided that the following conditions are met: |
6 | * |
6 | * |
7 | * Redistributions of source code must retain the above copyright notice, this |
7 | * Redistributions of source code must retain the above copyright notice, this |
8 | * list of conditions and the following disclaimer. |
8 | * list of conditions and the following disclaimer. |
9 | * |
9 | * |
10 | * Redistributions in binary form must reproduce the above copyright notice, |
10 | * Redistributions in binary form must reproduce the above copyright notice, |
11 | * this list of conditions and the following disclaimer in the documentation |
11 | * this list of conditions and the following disclaimer in the documentation |
12 | * and/or other materials provided with the distribution. |
12 | * and/or other materials provided with the distribution. |
13 | * |
13 | * |
14 | * Neither the name of the original program's authors nor the names of its |
14 | * Neither the name of the original program's authors nor the names of its |
15 | * contributors may be used to endorse or promote products derived from this |
15 | * contributors may be used to endorse or promote products derived from this |
16 | * software without specific prior written permission. |
16 | * software without specific prior written permission. |
17 | * |
17 | * |
18 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
18 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
19 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
20 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
21 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
22 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
22 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
23 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
24 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
25 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
25 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
26 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
26 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
27 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
27 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
28 | * POSSIBILITY OF SUCH DAMAGE. |
28 | * POSSIBILITY OF SUCH DAMAGE. |
29 | */ |
29 | */ |
30 | 30 | ||
31 | #include <stdio.h> |
31 | #include <stdio.h> |
32 | #include <string.h> |
32 | #include <string.h> |
33 | #include <stdlib.h> |
33 | #include <stdlib.h> |
34 | #include <unistd.h> |
34 | #include <unistd.h> |
35 | #include <stdarg.h> |
35 | #include <stdarg.h> |
36 | 36 | ||
37 | #include "config.h" |
37 | #include "config.h" |
38 | #include "errors.h" |
38 | #include "errors.h" |
39 | #include "errstr.h" |
39 | #include "errstr.h" |
40 | 40 | ||
- | 41 | volatile int cli_errno = CL_EOK; |
|
- | 42 | extern volatile unsigned int cli_quit; |
|
- | 43 | ||
41 | /* Error printing, translation and handling functions */ |
44 | /* Error printing, translation and handling functions */ |
42 | 45 | ||
43 | volatile int cli_lasterr = 0; |
- | |
44 | extern volatile unsigned int cli_verbocity; |
- | |
45 | 46 | ||
46 | /* Look up errno in cl_errors and return the corresponding string. |
47 | /* Look up errno in cl_errors and return the corresponding string. |
47 | * Return NULL if not found */ |
48 | * Return NULL if not found */ |
48 | char *err2str(int errno) |
49 | static char *err2str(int err) |
49 | { |
50 | { |
50 | 51 | ||
51 | if (NULL != cl_errors[errno]) |
52 | if (NULL != cl_errors[err]) |
52 | return cl_errors[errno]; |
53 | return cl_errors[err]; |
53 | 54 | ||
54 | return (char *)NULL; |
55 | return (char *)NULL; |
55 | } |
56 | } |
56 | 57 | ||
57 | /* Print an error report signifying errno, which is translated to |
58 | /* Print an error report signifying errno, which is translated to |
58 | * its corresponding human readable string. If errno > 0, raise the |
59 | * its corresponding human readable string. If errno > 0, raise the |
59 | * cli_quit int that tells the main program loop to exit immediately */ |
60 | * cli_quit int that tells the main program loop to exit immediately */ |
60 | 61 | ||
61 | void cli_error(int errno, const char *fmt, ...) |
62 | void cli_error(int err, const char *fmt, ...) |
62 | { |
63 | { |
63 | va_list vargs; |
64 | va_list vargs; |
64 | va_start(vargs, fmt); |
65 | va_start(vargs, fmt); |
65 | vprintf(fmt, vargs); |
66 | vprintf(fmt, vargs); |
66 | va_end(vargs); |
67 | va_end(vargs); |
67 | 68 | ||
68 | if (NULL != err2str(errno)) |
69 | if (NULL != err2str(err)) |
69 | printf(" (%s)\n", err2str(errno)); |
70 | printf(" (%s)\n", err2str(err)); |
70 | else |
71 | else |
71 | printf(" (Unknown Error %d)\n", errno); |
72 | printf(" (Unknown Error %d)\n", err); |
72 | - | ||
73 | if (errno < 0) |
- | |
74 | exit(EXIT_FAILURE); |
- | |
75 | - | ||
76 | } |
- | |
77 | 73 | ||
78 | /* Just a smart printf(), print the string only if cli_verbocity is high */ |
74 | /* If fatal, raise cli_quit so that we try to exit |
- | 75 | * gracefully. This will break the main loop and |
|
79 | void cli_verbose(const char *fmt, ...) |
76 | * invoke the destructor */ |
80 | { |
- | |
81 | if (cli_verbocity) { |
77 | if (err == CL_EFATAL) |
82 | va_list vargs; |
78 | cli_quit = 1; |
83 | 79 | ||
84 | printf("[*] "); |
- | |
85 | va_start(vargs, fmt); |
- | |
86 | vprintf(fmt, vargs); |
- | |
87 | va_end(vargs); |
- | |
88 | printf("\n"); |
- | |
89 | } |
- | |
90 | return; |
80 | return; |
- | 81 | ||
91 | } |
82 | } |
92 | 83 | ||
- | 84 | ||
93 | 85 | ||
94 | 86 | ||
95 | 87 | ||
96 | 88 |