mirror of
https://github.com/moparisthebest/curl
synced 2025-01-09 13:08:00 -05:00
4a5aa6682d
This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:
f871de0... build: make use of 76 lib/*.h renamed files
ffd8e12... build: rename 76 lib/*.h files
This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:
c087374... curl_setup.h: remove redundant include guard
This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:
13606bb... build: make use of 93 lib/*.c renamed files
5b6e792... build: rename 93 lib/*.c files
7d83dff... build: commit 13606bbfde follow-up 1
Start of related discussion thread:
http://curl.haxx.se/mail/lib-2013-01/0012.html
Asking for confirmation on pushing this revertion commit:
http://curl.haxx.se/mail/lib-2013-01/0048.html
Confirmation summary:
http://curl.haxx.se/mail/lib-2013-01/0079.html
NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.
lib/curl_imap.h
lib/curl_smtp.h
101 lines
2.7 KiB
C
101 lines
2.7 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#define ENABLE_CURLX_PRINTF
|
|
/* use our own printf() functions */
|
|
#include "curlx.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_msgs.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
#define WARN_PREFIX "Warning: "
|
|
#define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX))
|
|
|
|
/*
|
|
* Emit warning formatted message on configured 'errors' stream unless
|
|
* mute (--silent) was selected.
|
|
*/
|
|
|
|
void warnf(struct Configurable *config, const char *fmt, ...)
|
|
{
|
|
if(!config->mute) {
|
|
va_list ap;
|
|
int len;
|
|
char *ptr;
|
|
char print_buffer[256];
|
|
|
|
va_start(ap, fmt);
|
|
len = vsnprintf(print_buffer, sizeof(print_buffer), fmt, ap);
|
|
va_end(ap);
|
|
|
|
ptr = print_buffer;
|
|
while(len > 0) {
|
|
fputs(WARN_PREFIX, config->errors);
|
|
|
|
if(len > (int)WARN_TEXTWIDTH) {
|
|
int cut = WARN_TEXTWIDTH-1;
|
|
|
|
while(!ISSPACE(ptr[cut]) && cut) {
|
|
cut--;
|
|
}
|
|
if(0 == cut)
|
|
/* not a single cutting position was found, just cut it at the
|
|
max text width then! */
|
|
cut = WARN_TEXTWIDTH-1;
|
|
|
|
(void)fwrite(ptr, cut + 1, 1, config->errors);
|
|
fputs("\n", config->errors);
|
|
ptr += cut+1; /* skip the space too */
|
|
len -= cut;
|
|
}
|
|
else {
|
|
fputs(ptr, config->errors);
|
|
len = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Emit help formatted message on given stream.
|
|
*/
|
|
|
|
void helpf(FILE *errors, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
if(fmt) {
|
|
va_start(ap, fmt);
|
|
fputs("curl: ", errors); /* prefix it */
|
|
vfprintf(errors, fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
fprintf(errors, "curl: try 'curl --help' "
|
|
#ifdef USE_MANUAL
|
|
"or 'curl --manual' "
|
|
#endif
|
|
"for more information\n");
|
|
}
|
|
|