X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/eb93fa95c4bdc3e991f977f4f166259cf3419750..4e53f3dcd47d9208cff59bdacefdacf554b37962:/src/file.c?ds=sidebyside diff --git a/src/file.c b/src/file.c index b1fd3b40..3c30c30f 100644 --- a/src/file.c +++ b/src/file.c @@ -28,8 +28,19 @@ #include #include +#include +#ifdef HAVE_UNISTD_H +#include +#endif #include #include +#include + +/* Relax some dependencies */ +#if ! GLIB_CHECK_VERSION(2,12,0) +static gboolean return_true (gpointer a, gpointer b, gpointer c) { return TRUE; } +static g_hash_table_remove_all (GHashTable *ght) { g_hash_table_foreach_remove ( ght, (GHRFunc) return_true, FALSE ); } +#endif #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') ) #define VIK_MAGIC "#VIK" @@ -92,40 +103,24 @@ static guint16 layer_type_from_string ( const gchar *str ) return -1; } -static void write_layer_params_and_data ( VikLayer *l, FILE *f ) -{ - VikLayerParam *params = vik_layer_get_interface(l->type)->params; - VikLayerFuncGetParam get_param = vik_layer_get_interface(l->type)->get_param; - - fprintf ( f, "name=%s\n", l->name ? l->name : "" ); - if ( !l->visible ) - fprintf ( f, "visible=f\n" ); - - if ( params && get_param ) - { - VikLayerParamData data; - guint16 i, params_count = vik_layer_get_interface(l->type)->params_count; - for ( i = 0; i < params_count; i++ ) - { - data = get_param(l,i); - +void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data ) { /* string lists are handled differently. We get a GList (that shouldn't * be freed) back for get_param and if it is null we shouldn't write * anything at all (otherwise we'd read in a list with an empty string, -   * not an empty string list. + * not an empty string list. */ - if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) { + if ( type == VIK_LAYER_PARAM_STRING_LIST ) { if ( data.sl ) { GList *iter = (GList *)data.sl; while ( iter ) { - fprintf ( f, "%s=", params[i].name ); + fprintf ( f, "%s=", name ); fprintf ( f, "%s\n", (gchar *)(iter->data) ); iter = iter->next; } } } else { - fprintf ( f, "%s=", params[i].name ); - switch ( params[i].type ) + fprintf ( f, "%s=", name ); + switch ( type ) { case VIK_LAYER_PARAM_DOUBLE: { // char buf[15]; /* locale independent */ @@ -140,6 +135,25 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f ) case VIK_LAYER_PARAM_COLOR: fprintf ( f, "#%.2x%.2x%.2x\n", (int)(data.c.red/256),(int)(data.c.green/256),(int)(data.c.blue/256)); break; } } +} + +static void write_layer_params_and_data ( VikLayer *l, FILE *f ) +{ + VikLayerParam *params = vik_layer_get_interface(l->type)->params; + VikLayerFuncGetParam get_param = vik_layer_get_interface(l->type)->get_param; + + fprintf ( f, "name=%s\n", l->name ? l->name : "" ); + if ( !l->visible ) + fprintf ( f, "visible=f\n" ); + + if ( params && get_param ) + { + VikLayerParamData data; + guint16 i, params_count = vik_layer_get_interface(l->type)->params_count; + for ( i = 0; i < params_count; i++ ) + { + data = get_param(l,i); + file_write_layer_param(f, params[i].name, params[i].type, data); } } if ( vik_layer_get_interface(l->type)->write_file_data ) @@ -159,6 +173,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) Stack *stack = NULL; VikLayer *current_layer; struct LatLon ll; + VikViewportDrawMode mode; gchar *modestring; push(&stack); @@ -168,12 +183,13 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) /* crazhy CRAZHY */ vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll ); - switch ( vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ) ) { + mode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ); + switch ( mode ) { case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break; case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break; - case VIK_VIEWPORT_DRAWMODE_GOOGLE: modestring = "google"; break; - case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break; - default: modestring = "mercator"; + case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break; + default: + g_critical("Houston, we've had a problem. mode=%d", mode); } fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\ndrawcentermark=%s", @@ -230,12 +246,13 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) static void string_list_delete ( gpointer key, gpointer l, gpointer user_data ) { - GList *iter = (GList *) iter; + /* 20071021 bugfix */ + GList *iter = (GList *) l; while ( iter ) { g_free ( iter->data ); iter = iter->next; } - g_list_free ( (GList *) iter ); + g_list_free ( (GList *) l ); } static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp) @@ -306,7 +323,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) push(&stack); if ( type == -1 ) { - g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 ); + g_warning ( "Line %ld: Unknown type %s", line_num, line+6 ); stack->data = NULL; } else if (parent_type == VIK_LAYER_GPS) @@ -405,9 +422,13 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0) vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA ); else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0) - vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_GOOGLE ); + { + g_warning ( _("Draw mode '%s' no more supported"), "google" ); + } else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0) - vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_KH ); + { + g_warning ( _("Draw mode '%s' no more supported"), "kh" ); + } else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0) vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR ); else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 ) @@ -439,8 +460,9 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) VikLayerParamData x; line += eq_pos+1; if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) { - GList *l = g_list_append ( g_hash_table_lookup ( string_lists, (gpointer) ((gint) i) ), g_strdup(line) ); - g_hash_table_replace ( string_lists, (gpointer) ((gint)i), l ); + GList *l = g_list_append ( g_hash_table_lookup ( string_lists, GINT_TO_POINTER ((gint) i) ), + g_strdup(line) ); + g_hash_table_replace ( string_lists, GINT_TO_POINTER ((gint)i), l ); /* add the value to a list, possibly making a new list. * this will be passed to the layer when we read an ~EndLayer */ } else { @@ -517,13 +539,15 @@ static FILE *xfopen ( const char *fn, const char *mode ) if ( strcmp(fn,"-") == 0 ) return stdin; else - return fopen(fn, "r"); + return g_fopen(fn, "r"); } static void xfclose ( FILE *f ) { - if ( f != stdin && f != stdout ) + if ( f != stdin && f != stdout ) { fclose ( f ); + f = NULL; + } } /* 0 on failure, 1 on success (vik file) 2 on success (other file) */ @@ -567,7 +591,7 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename ) { - FILE *f = fopen(filename, "w"); + FILE *f = g_fopen(filename, "w"); if ( ! f ) return FALSE; @@ -575,6 +599,7 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam file_write ( top, f, vp ); fclose(f); + f = NULL; return TRUE; } @@ -593,7 +618,7 @@ const gchar *a_file_basename ( const gchar *filename ) gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type ) { - FILE *f = fopen ( filename, "w" ); + FILE *f = g_fopen ( filename, "w" ); if ( f ) { if ( file_type == FILE_TYPE_GPSMAPPER ) @@ -603,6 +628,7 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_ty else a_gpspoint_write_file ( vtl, f ); fclose ( f ); + f = NULL; return TRUE; } return FALSE; @@ -612,24 +638,26 @@ const gchar *a_get_viking_dir() { static gchar *viking_dir = NULL; + // TODO: use g_get_user_config_dir ? + if (!viking_dir) { const gchar *home = g_getenv("HOME"); - if (!home || access(home, W_OK)) + if (!home || g_access(home, W_OK)) home = g_get_home_dir (); #ifdef HAVE_MKDTEMP - if (!home || access(home, W_OK)) + if (!home || g_access(home, W_OK)) { static gchar temp[] = {"/tmp/vikXXXXXX"}; home = mkdtemp(temp); } #endif - if (!home || access(home, W_OK)) + if (!home || g_access(home, W_OK)) /* Fatal error */ g_critical("Unable to find a base directory"); /* Build the name of the directory */ viking_dir = g_build_filename(home, ".viking", NULL); - if (access(viking_dir, F_OK)) + if (g_file_test(viking_dir, G_FILE_TEST_EXISTS) == FALSE) g_mkdir(viking_dir, 0755); }