Add -upgrade-config option.

* Print warning when old-style configuration is used.
* Add -upgrade-config option.

1 files changed, 18 insertions, 18 deletions

diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index dec93682..657a1d48 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -575,53 +575,53 @@ void config_parse_xresource_dump ( void )
     }
 }
 
-static void config_parse_dump_config_option ( XrmOption *option )
+static void config_parse_dump_config_option ( FILE *out, XrmOption *option )
 {
     if ( option->type == xrm_Char || option->source == CONFIG_DEFAULT ) {
-        printf ( "/*" );
+        fprintf ( out,  "/*" );
     }
-    printf ( "\t%s: ", option->name );
+    fprintf ( out,  "\t%s: ", option->name );
     switch ( option->type )
     {
     case xrm_Number:
-        printf ( "%u", *( option->value.num ) );
+        fprintf ( out,  "%u", *( option->value.num ) );
         break;
     case xrm_SNumber:
-        printf ( "%i", *( option->value.snum ) );
+        fprintf ( out,  "%i", *( option->value.snum ) );
         break;
     case xrm_String:
         if ( ( *( option->value.str ) ) != NULL ) {
             // TODO should this be escaped?
-            printf ( "\"%s\"", *( option->value.str ) );
+            fprintf ( out,  "\"%s\"", *( option->value.str ) );
         }
         break;
     case xrm_Boolean:
-        printf ( "%s", ( *( option->value.num ) == TRUE ) ? "true" : "false" );
+        fprintf ( out,  "%s", ( *( option->value.num ) == TRUE ) ? "true" : "false" );
         break;
     case xrm_Char:
         // TODO
         if ( *( option->value.charc ) > 32 && *( option->value.charc ) < 127 ) {
-            printf ( "'%c'", *( option->value.charc ) );
+            fprintf ( out,  "'%c'", *( option->value.charc ) );
         }
         else {
-            printf ( "'\\x%02X'", *( option->value.charc ) );
+            fprintf ( out,  "'\\x%02X'", *( option->value.charc ) );
         }
-        printf ( " /* unsupported */" );
+        fprintf ( out,  " /* unsupported */" );
         break;
     default:
         break;
     }
 
-    printf ( ";" );
+    fprintf ( out,  ";" );
     if ( option->type == xrm_Char || option->source == CONFIG_DEFAULT ) {
-        printf ( "*/" );
+        fprintf ( out,  "*/" );
     }
-    printf ( "\n" );
+    fprintf ( out,  "\n" );
 }
 
-void config_parse_dump_config_rasi_format ( gboolean changes )
+void config_parse_dump_config_rasi_format ( FILE *out, gboolean changes )
 {
-    printf ( "configuration {\n" );
+    fprintf ( out, "configuration {\n" );
 
     unsigned int entries = sizeof ( xrmOptions ) / sizeof ( *xrmOptions );
     for ( unsigned int i = 0; i < entries; ++i ) {
@@ -632,16 +632,16 @@ void config_parse_dump_config_rasi_format ( gboolean changes )
             }
         }
         if ( !changes || xrmOptions[i].source != CONFIG_DEFAULT ) {
-            config_parse_dump_config_option ( &( xrmOptions[i] ) );
+            config_parse_dump_config_option ( out, &( xrmOptions[i] ) );
         }
     }
     for ( unsigned int i = 0; i < num_extra_options; i++ ) {
         if ( !changes || extra_options[i].source != CONFIG_DEFAULT ) {
-            config_parse_dump_config_option ( &( extra_options[i] ) );
+            config_parse_dump_config_option ( out, &( extra_options[i] ) );
         }
     }
 
-    printf ( "}\n" );
+    fprintf ( out, "}\n" );
 }
 
 static void print_option_string ( XrmOption *xo, int is_term )