diff options
| -rw-r--r-- | lib/libfetch/common.c | 6 | ||||
| -rw-r--r-- | lib/libfetch/fetch.c | 12 | ||||
| -rw-r--r-- | lib/libfetch/ftp.c | 5 | ||||
| -rw-r--r-- | lib/libfetch/http.c | 20 |
4 files changed, 21 insertions, 22 deletions
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index b39839a..88c93a5 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -208,7 +208,7 @@ _fetch_connect(const char *host, int port, int af, int verbose) struct addrinfo hints, *res, *res0; int sd, err; - DEBUG(fprintf(stderr, "\033[1m---> %s:%d\033[m\n", host, port)); + DEBUG(fprintf(stderr, "---> %s:%d\n", host, port)); if (verbose) _fetch_info("looking up %s", host); @@ -324,7 +324,7 @@ _fetch_getln(int fd, char **buf, size_t *size, size_t *len) } } while (c != '\n'); - DEBUG(fprintf(stderr, "\033[1m<<< %.*s\033[m", (int)*len, *buf)); + DEBUG(fprintf(stderr, "<<< %.*s", (int)*len, *buf)); return 0; } @@ -348,7 +348,7 @@ _fetch_putln(int fd, const char *str, size_t len) wlen = writev(fd, iov, 2); if (wlen < 0 || (size_t)wlen != len) return -1; - DEBUG(fprintf(stderr, "\033[1m>>> %s\n\033[m", str)); + DEBUG(fprintf(stderr, ">>> %s\n", str)); return 0; } diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c index 9941ab5..5fb4471 100644 --- a/lib/libfetch/fetch.c +++ b/lib/libfetch/fetch.c @@ -403,12 +403,12 @@ nohost: } DEBUG(fprintf(stderr, - "scheme: [\033[1m%s\033[m]\n" - "user: [\033[1m%s\033[m]\n" - "password: [\033[1m%s\033[m]\n" - "host: [\033[1m%s\033[m]\n" - "port: [\033[1m%d\033[m]\n" - "document: [\033[1m%s\033[m]\n", + "scheme: [%s]\n" + "user: [%s]\n" + "password: [%s]\n" + "host: [%s]\n" + "port: [%d]\n" + "document: [%s]\n", u->scheme, u->user, u->pwd, u->host, u->port, u->doc)); diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 28861b5..64d37b2 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -267,7 +267,7 @@ _ftp_stat(int cd, const char *file, struct url_stat *us) } if (us->size == 0) us->size = -1; - DEBUG(fprintf(stderr, "size: [\033[1m%lld\033[m]\n", (long long)us->size)); + DEBUG(fprintf(stderr, "size: [%lld]\n", (long long)us->size)); if ((e = _ftp_cmd(cd, "MDTM %s", s)) != FTP_FILE_STATUS) { _ftp_seterr(e); @@ -301,8 +301,7 @@ _ftp_stat(int cd, const char *file, struct url_stat *us) t = time(NULL); us->mtime = t; us->atime = t; - DEBUG(fprintf(stderr, "last modified: [\033[1m%04d-%02d-%02d " - "%02d:%02d:%02d\033[m]\n", + DEBUG(fprintf(stderr, "last modified: [%04d-%02d-%02d %02d:%02d:%02d]\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec)); return 0; diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c index 10c3a78..0cd1186 100644 --- a/lib/libfetch/http.c +++ b/lib/libfetch/http.c @@ -146,11 +146,11 @@ _http_new_chunk(struct cookie *c) if (fetchDebug) { c->total += c->chunksize; if (c->chunksize == 0) - fprintf(stderr, "\033[1m_http_fillbuf(): " - "end of last chunk\033[m\n"); + fprintf(stderr, "_http_fillbuf(): " + "end of last chunk\n"); else - fprintf(stderr, "\033[1m_http_fillbuf(): " - "new chunk: %lu (%lu)\033[m\n", + fprintf(stderr, "_http_fillbuf(): " + "new chunk: %lu (%lu)\n", (unsigned long)c->chunksize, (unsigned long)c->total); } #endif @@ -447,8 +447,8 @@ _http_parse_mtime(const char *p, time_t *mtime) setlocale(LC_TIME, locale); if (r == NULL) return -1; - DEBUG(fprintf(stderr, "last modified: [\033[1m%04d-%02d-%02d " - "%02d:%02d:%02d\033[m]\n", + DEBUG(fprintf(stderr, "last modified: [%04d-%02d-%02d " + "%02d:%02d:%02d]\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec)); *mtime = timegm(&tm); @@ -467,7 +467,7 @@ _http_parse_length(const char *p, off_t *length) len = len * 10 + (*p - '0'); if (*p) return -1; - DEBUG(fprintf(stderr, "content length: [\033[1m%lld\033[m]\n", + DEBUG(fprintf(stderr, "content length: [%lld]\n", (long long)len)); *length = len; return 0; @@ -495,7 +495,7 @@ _http_parse_range(const char *p, off_t *offset, off_t *length, off_t *size) len = len * 10 + *p - '0'; if (*p || len < last - first + 1) return -1; - DEBUG(fprintf(stderr, "content range: [\033[1m%lld-%lld/%lld\033[m]\n", + DEBUG(fprintf(stderr, "content range: [%lld-%lld/%lld]\n", (long long)first, (long long)last, (long long)len)); *offset = first; *length = last - first + 1; @@ -573,8 +573,8 @@ _http_basic_auth(int fd, const char *hdr, const char *usr, const char *pwd) char *upw, *auth; int r; - DEBUG(fprintf(stderr, "usr: [\033[1m%s\033[m]\n", usr)); - DEBUG(fprintf(stderr, "pwd: [\033[1m%s\033[m]\n", pwd)); + DEBUG(fprintf(stderr, "usr: [%s]\n", usr)); + DEBUG(fprintf(stderr, "pwd: [%s]\n", pwd)); if (asprintf(&upw, "%s:%s", usr, pwd) == -1) return -1; auth = _http_base64(upw); |
