summaryrefslogtreecommitdiff
path: root/ubi-utils/src/error.c
diff options
context:
space:
mode:
authorDrake Dowsett <dowsett@de.ibm.com>2006-11-06 16:54:10 +0100
committerFrank Haverkamp <haver@vnet.ibm.com>2006-11-06 16:54:10 +0100
commit31b015fc08a13a5b63245808f7d1a49eadd8193a (patch)
tree6ab4ce9a35f18e7b53c95c5cb8063cc55e54615d /ubi-utils/src/error.c
parent6918e0320c89bc892a6c5d2c6792e5d058e40a6e (diff)
[MTD] UBI: pfiflash needs to flash raw sections and check CRC
Flashing of raw partitions should be possible now. CRC checking of pfi files before flashing the content was added. Signed-off-by: Frank Haverkamp <haver@vnet.ibm.com>
Diffstat (limited to 'ubi-utils/src/error.c')
-rw-r--r--ubi-utils/src/error.c67
1 files changed, 65 insertions, 2 deletions
diff --git a/ubi-utils/src/error.c b/ubi-utils/src/error.c
index c8c623c..4aaedad 100644
--- a/ubi-utils/src/error.c
+++ b/ubi-utils/src/error.c
@@ -25,6 +25,7 @@
#include "error.h"
#define MAXLINE 4096
+#define MAXWIDTH 80
static FILE *logfp = NULL;
@@ -35,6 +36,9 @@ read_procfile(FILE *fp_out, const char *procfile)
{
FILE *fp;
+ if (!fp_out)
+ return -ENXIO;
+
fp = fopen(procfile, "r");
if (!fp)
return -ENOENT;
@@ -57,6 +61,9 @@ read_procfile(FILE *fp_out, const char *procfile)
void
error_initlog(const char *logfile)
{
+ if (!logfile)
+ return;
+
logfp = fopen(logfile, "a+");
read_procfile(logfp, "/proc/cpuinfo");
}
@@ -143,7 +150,11 @@ __err_dump(const char *fmt, ...)
exit(EXIT_FAILURE); /* shouldn't get here */
}
-
+/**
+ * If a logfile is used we must not print on stderr and stdout
+ * anymore. Since pfilfash might be used in a server context, it is
+ * even dangerous to write to those descriptors.
+ */
static void
err_doit(int errnoflag, int level __attribute__((unused)),
const char *fmt, va_list ap)
@@ -166,9 +177,61 @@ err_doit(int errnoflag, int level __attribute__((unused)),
if (logfp) {
fputs(buf, logfp);
fflush(logfp);
+ return; /* exit when logging completes */
}
- fputs(buf, fpout);
+ if (fpout == stderr) {
+ /* perform line wrap when outputting to stderr */
+ int word_len, post_len, chars;
+ char *buf_ptr;
+ const char *frmt = "%*s%n %n";
+
+ chars = 0;
+ buf_ptr = buf;
+ while (sscanf(buf_ptr, frmt, &word_len, &post_len) != EOF) {
+ int i;
+ char word[word_len + 1];
+ char post[post_len + 1];
+
+ strncpy(word, buf_ptr, word_len);
+ word[word_len] = '\0';
+ buf_ptr += word_len;
+ post_len -= word_len;
+
+ if (chars + word_len > MAXWIDTH) {
+ fputc('\n', fpout);
+ chars = 0;
+ }
+ fputs(word, fpout);
+ chars += word_len;
+
+ if (post_len > 0) {
+ strncpy(post, buf_ptr, post_len);
+ post[post_len] = '\0';
+ buf_ptr += post_len;
+ }
+ for (i = 0; i < post_len; i++) {
+ int inc = 1, chars_new;
+
+ if (post[i] == '\t')
+ inc = 8;
+ if (post[i] == '\n') {
+ inc = 0;
+ chars_new = 0;
+ } else
+ chars_new = chars + inc;
+
+ if (chars_new > MAXWIDTH) {
+ fputc('\n', fpout);
+ chars_new = inc;
+ }
+ fputc(post[i], fpout);
+ chars = chars_new;
+ }
+ }
+ }
+ else
+ fputs(buf, fpout);
fflush(fpout);
if (fpout != stderr)
fclose(fpout);