Compatibility tweaks to format_and_print_line.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8fe0e34b5cb60fa1d80f44ec9869cc6216147cab..e4f98d75f56577627831e8731c9b7fd54355360a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        * url.c (url_error): Use aprintf, not asprintf.

diff --git a/src/main.c b/src/main.c
index 268a603ffbd144375520bd59e0ab59998976f2b3..46e5444531ca8962853ebb8596ec5b0421b46bd8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -709,17 +709,21 @@ static void
 format_and_print_line (char* prefix, char* line,
                       int line_length) 
 {
+  int leading_spaces;
+  int remaining_chars;
+  char *token;
+  
   assert (prefix != NULL);
   assert (line != NULL);
 
   if (line_length <= 0)
     line_length = max_chars_per_line;
 
-  const int leading_spaces = strlen (prefix);
+  leading_spaces = strlen (prefix);
   printf ("%s", prefix);
-  int remaining_chars = line_length - leading_spaces;
+  remaining_chars = line_length - leading_spaces;
   /* We break on spaces. */
-  char* token = strtok (line, " ");
+  token = strtok (line, " ");
   while (token != NULL) 
     {
       /* 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. */
       if (remaining_chars <= strlen (token)) 
         {
+          int j;
           printf ("\n");
-          int j = 0;
+          j = 0;
           for (j = 0; j < leading_spaces; j++) 
             {
               printf (" ");
@@ -759,13 +764,14 @@ print_version (void)
   const char *link_title    = "Link       : ";
   const char *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 (options_title);
   /* compiled_features is a char*[]. We limit the characters per
      line to max_chars_per_line and prefix each line with a constant
      number of spaces for proper alignment. */
-  int i =0;
   for (i = 0; compiled_features[i] != NULL; ) 
     {
       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 
      absent. */
   printf (wgetrc_title);
-  char *env_wgetrc = wgetrc_env_file_name ();
+  env_wgetrc = wgetrc_env_file_name ();
   if (env_wgetrc && *env_wgetrc) 
     {
       printf ("%s (env)\n%s", env_wgetrc, prefix_spaces);
       xfree (env_wgetrc);
     }
-  char *user_wgetrc = wgetrc_user_file_name ();
+  user_wgetrc = wgetrc_user_file_name ();
   if (user_wgetrc) 
     {
       printf ("%s (user)\n%s", user_wgetrc, prefix_spaces);
@@ -798,6 +804,8 @@ print_version (void)
     }
 #ifdef SYSTEM_WGETRC
   printf ("%s (system)\n", SYSTEM_WGETRC);
+#else
+  putchar ('\n');
 #endif
 
   format_and_print_line (strdup (locale_title),