moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Compatibility tweaks to format_and_print_line.

Browse Source
This commit is contained in:
Gisle Vanem 2008-10-26 13:18:36 -07:00
parent b4ebafa39c
commit 871992e247
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2008-10-26 Gisle Vanem <gvanem@broadpark.no>
* main.c (format_and_print_line): Put variables on top of
blocks (not all compilers are C99). Add an extra '\n' if
SYSTEM_WGETRC isn't defined and printed.
2008-09-09 Gisle Vanem <gvanem@broadpark.no> 2008-09-09 Gisle Vanem <gvanem@broadpark.no>
* url.c (url_error): Use aprintf, not asprintf. * url.c (url_error): Use aprintf, not asprintf.

22
src/main.c
View File

@ -709,17 +709,21 @@ static void
format_and_print_line (char* prefix, char* line, format_and_print_line (char* prefix, char* line,
int line_length) int line_length)
{ {
int leading_spaces;
int remaining_chars;
char *token;
assert (prefix != NULL); assert (prefix != NULL);
assert (line != NULL); assert (line != NULL);
if (line_length <= 0) if (line_length <= 0)
line_length = max_chars_per_line; line_length = max_chars_per_line;
const int leading_spaces = strlen (prefix); leading_spaces = strlen (prefix);
printf ("%s", prefix); printf ("%s", prefix);
int remaining_chars = line_length - leading_spaces; remaining_chars = line_length - leading_spaces;
/* We break on spaces. */ /* We break on spaces. */
char* token = strtok (line, " "); token = strtok (line, " ");
while (token != NULL) while (token != NULL)
{ {
/* If however a token is much larger than the maximum /* If however a token is much larger than the maximum
@ -727,8 +731,9 @@ format_and_print_line (char* prefix, char* line,
token on the next line. */ token on the next line. */
if (remaining_chars <= strlen (token)) if (remaining_chars <= strlen (token))
{ {
int j;
printf ("\n"); printf ("\n");
int j = 0; j = 0;
for (j = 0; j < leading_spaces; j++) for (j = 0; j < leading_spaces; j++)
{ {
printf (" "); printf (" ");
@ -759,13 +764,14 @@ print_version (void)
const char *link_title = "Link : "; const char *link_title = "Link : ";
const char *prefix_spaces = " "; const char *prefix_spaces = " ";
const int prefix_space_length = strlen (prefix_spaces); const int prefix_space_length = strlen (prefix_spaces);
char *env_wgetrc, *user_wgetrc;
int i;
printf ("GNU Wget %s\n", version_string); printf ("GNU Wget %s\n", version_string);
printf (options_title); printf (options_title);
/* compiled_features is a char*[]. We limit the characters per /* compiled_features is a char*[]. We limit the characters per
line to max_chars_per_line and prefix each line with a constant line to max_chars_per_line and prefix each line with a constant
number of spaces for proper alignment. */ number of spaces for proper alignment. */
int i =0;
for (i = 0; compiled_features[i] != NULL; ) for (i = 0; compiled_features[i] != NULL; )
{ {
int line_length = max_chars_per_line - prefix_space_length; int line_length = max_chars_per_line - prefix_space_length;
@ -784,13 +790,13 @@ print_version (void)
/* Handle the case when $WGETRC is unset and $HOME/.wgetrc is /* Handle the case when $WGETRC is unset and $HOME/.wgetrc is
absent. */ absent. */
printf (wgetrc_title); printf (wgetrc_title);
char *env_wgetrc = wgetrc_env_file_name (); env_wgetrc = wgetrc_env_file_name ();
if (env_wgetrc && *env_wgetrc) if (env_wgetrc && *env_wgetrc)
{ {
printf ("%s (env)\n%s", env_wgetrc, prefix_spaces); printf ("%s (env)\n%s", env_wgetrc, prefix_spaces);
xfree (env_wgetrc); xfree (env_wgetrc);
} }
char *user_wgetrc = wgetrc_user_file_name (); user_wgetrc = wgetrc_user_file_name ();
if (user_wgetrc) if (user_wgetrc)
{ {
printf ("%s (user)\n%s", user_wgetrc, prefix_spaces); printf ("%s (user)\n%s", user_wgetrc, prefix_spaces);
@ -798,6 +804,8 @@ print_version (void)
} }
#ifdef SYSTEM_WGETRC #ifdef SYSTEM_WGETRC
printf ("%s (system)\n", SYSTEM_WGETRC); printf ("%s (system)\n", SYSTEM_WGETRC);
#else
putchar ('\n');
#endif #endif
format_and_print_line (strdup (locale_title), format_and_print_line (strdup (locale_title),