Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 37052) +++ trunk/src/board.c (revision 37053) @@ -57,7 +57,7 @@ free(pcb->line_mod_merge); free(pcb->hidlib.name); - free(pcb->hidlib.filename); + free(pcb->hidlib.loadname); free(pcb->PrintFilename); pcb_ratspatch_destroy(pcb); pcb_data_free(pcb->Data); @@ -147,10 +147,10 @@ if (dpcb == 0) { nw = PCB; - if (nw->hidlib.filename != NULL) { + if (nw->hidlib.loadname != NULL) { /* make sure the new PCB doesn't inherit the name and loader of the default pcb */ - free(nw->hidlib.filename); - nw->hidlib.filename = NULL; + free(nw->hidlib.loadname); + nw->hidlib.loadname = NULL; nw->Data->loader = NULL; } } @@ -251,7 +251,7 @@ const char *pcb_board_get_filename(void) { - return PCB->hidlib.filename; + return PCB->hidlib.loadname; } const char *pcb_board_get_name(void) Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 37052) +++ trunk/src/file_act.c (revision 37053) @@ -115,7 +115,7 @@ break; case F_Revert: - if (RND_ACT_DESIGN->filename && (!pcb->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1))) + if (RND_ACT_DESIGN->loadname && (!pcb->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1))) pcb_revert_pcb(); break; @@ -263,7 +263,7 @@ rnd_message(RND_MSG_ERROR, "SaveTo(Layout) doesn't take file name or format - did you mean SaveTo(LayoutAs)?\n"); return FGW_ERR_ARGC; } - if (pcb_save_pcb(RND_ACT_DESIGN->filename, NULL) == 0) + if (pcb_save_pcb(RND_ACT_DESIGN->loadname, NULL) == 0) pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_false); rnd_event(RND_ACT_DESIGN, RND_EVENT_DESIGN_FN_CHANGED, NULL); return 0; @@ -271,8 +271,8 @@ case F_LayoutAs: if (pcb_save_pcb(name, fmt) == 0) { pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_false); - free(RND_ACT_DESIGN->filename); - RND_ACT_DESIGN->filename = rnd_strdup(name); + free(RND_ACT_DESIGN->loadname); + RND_ACT_DESIGN->loadname = rnd_strdup(name); rnd_event(RND_ACT_DESIGN, RND_EVENT_DESIGN_FN_CHANGED, NULL); } return 0; Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 37052) +++ trunk/src/main.c (revision 37053) @@ -530,7 +530,7 @@ exit(1); } /* keep filename if load failed: file might not exist, save it by that name */ - PCB->hidlib.filename = rnd_strdup(command_line_pcb); + PCB->hidlib.loadname = rnd_strdup(command_line_pcb); } } Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 37052) +++ trunk/src/main_act.c (revision 37053) @@ -276,7 +276,7 @@ RND_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); RND_ACT_IRES(0); - rnd_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_DESIGN->filename == NULL ? "" : RND_ACT_DESIGN->filename, 1); + rnd_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_DESIGN->loadname == NULL ? "" : RND_ACT_DESIGN->loadname, 1); rnd_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.X); rnd_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1); rnd_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 37052) +++ trunk/src/plug_io.c (revision 37053) @@ -372,9 +372,9 @@ int len; if (fmt == NULL) { - if (PCB->hidlib.filename != NULL) { /* have a file name, guess from extension */ - int fn_len = strlen(PCB->hidlib.filename); - const char *end = PCB->hidlib.filename + fn_len; + if (PCB->hidlib.loadname != NULL) { /* have a file name, guess from extension */ + int fn_len = strlen(PCB->hidlib.loadname); + const char *end = PCB->hidlib.loadname + fn_len; pcb_plug_io_t *n, *best = NULL; int best_score = 0; @@ -410,7 +410,7 @@ return NULL; } else { - if (PCB->hidlib.filename != NULL) + if (PCB->hidlib.loadname != NULL) rnd_message(RND_MSG_WARNING, "Saving a file with unknown format: failed to guess format from file name, falling back to %s as configured in rc/save_final_fallback_fmt\n", fmt); } } @@ -666,7 +666,7 @@ /* clear 'changed flag' */ pcb_board_set_changed_flag(PCB, rnd_false); - PCB->hidlib.filename = new_filename; + PCB->hidlib.loadname = new_filename; /* just in case a bad file saved file is loaded */ /* geda/pcb compatibility: use attribute PCB::grid::unit as unit, if present */ @@ -842,7 +842,7 @@ int pcb_revert_pcb(void) { - return real_load_pcb(PCB->hidlib.filename, NULL, rnd_true, rnd_true, 0); + return real_load_pcb(PCB->hidlib.loadname, NULL, rnd_true, rnd_true, 0); } int pcb_load_buffer(rnd_design_t *hidlib, pcb_buffer_t *buff, const char *fn, const char *fmt) Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 37052) +++ trunk/src/rats_patch.c (revision 37053) @@ -650,12 +650,12 @@ if (fn == NULL) { char *default_file; - if (PCB->hidlib.filename != NULL) { + if (PCB->hidlib.loadname != NULL) { char *end; int len; - len = strlen(PCB->hidlib.filename); + len = strlen(PCB->hidlib.loadname); default_file = malloc(len + 8); - memcpy(default_file, PCB->hidlib.filename, len + 1); + memcpy(default_file, PCB->hidlib.loadname, len + 1); end = strrchr(default_file, '.'); if ((end == NULL) || (rnd_strcasecmp(end, ".pcb") != 0)) end = default_file + len; Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 37052) +++ trunk/src_plugins/cam/cam.c (revision 37053) @@ -52,8 +52,8 @@ static void cam_init_inst_fn(cam_ctx_t *ctx) { - if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) { - char *fn = pcb_derive_default_filename_(PCB->hidlib.filename, ""); + if ((PCB != NULL) && (PCB->hidlib.loadname != NULL)) { + char *fn = pcb_derive_default_filename_(PCB->hidlib.loadname, ""); char *val, *end = strrchr(fn, RND_DIR_SEPARATOR_C); if (end != NULL) val = rnd_strdup(end+1); Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 37052) +++ trunk/src_plugins/cam/cam_gui.c (revision 37053) @@ -341,7 +341,7 @@ { /* set default outfile */ rnd_hid_attr_val_t hv; - hv.str = pcb_derive_default_filename_(PCB->hidlib.filename, ""); + hv.str = pcb_derive_default_filename_(PCB->hidlib.loadname, ""); rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->woutfile, &hv); free((char *)hv.str); cam_gui_opts2dlg(ctx); Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 37052) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 37053) @@ -97,7 +97,7 @@ } /* update labels */ - hv.str = rnd_strdup_printf("The file %s has changed on disk", PCB->hidlib.filename); + hv.str = rnd_strdup_printf("The file %s has changed on disk", PCB->hidlib.loadname); rnd_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[0], &hv); free((char *)hv.str); Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 37052) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 37053) @@ -421,7 +421,7 @@ memset(&save, 0, sizeof(save)); if (rnd_strcasecmp(function, "Layout") == 0) - if (PCB->hidlib.filename != NULL) + if (PCB->hidlib.loadname != NULL) return rnd_actionva(RND_ACT_DESIGN, "SaveTo", "Layout", NULL); if (is_dialog) { @@ -548,10 +548,10 @@ /* construct the input file name and run a file selection dialog to get the final file name */ if (name_in == NULL) { - if (PCB->hidlib.filename == NULL) + if (PCB->hidlib.loadname == NULL) name_in = rnd_concat("unnamed", extensions_param[fmt], NULL); else - name_in = rnd_strdup(PCB->hidlib.filename); + name_in = rnd_strdup(PCB->hidlib.loadname); } Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 37052) +++ trunk/src_plugins/export_bom/bom.c (revision 37053) @@ -65,7 +65,7 @@ { const char *val = bom_values[HA_bomfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &bom_values[HA_bomfile], ".bom"); + pcb_derive_default_filename(PCB->hidlib.loadname, &bom_values[HA_bomfile], ".bom"); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_c_draw/export_c_draw.c =================================================================== --- trunk/src_plugins/export_c_draw/export_c_draw.c (revision 37052) +++ trunk/src_plugins/export_c_draw/export_c_draw.c (revision 37053) @@ -92,7 +92,7 @@ const char *val = c_draw_values[HA_c_drawfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &c_draw_values[HA_c_drawfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &c_draw_values[HA_c_drawfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_debug/export_debug.c =================================================================== --- trunk/src_plugins/export_debug/export_debug.c (revision 37052) +++ trunk/src_plugins/export_debug/export_debug.c (revision 37053) @@ -100,7 +100,7 @@ const char *val = debug_values[HA_debugfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &debug_values[HA_debugfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &debug_values[HA_debugfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 37052) +++ trunk/src_plugins/export_dxf/dxf.c (revision 37053) @@ -203,7 +203,7 @@ const char *suffix = ".dxf"; const char *val = dxf_values[HA_dxffile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &dxf_values[HA_dxffile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &dxf_values[HA_dxffile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 37052) +++ trunk/src_plugins/export_excellon/excellon.c (revision 37053) @@ -206,7 +206,7 @@ { const char *val = excellon_values[HA_excellonfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &excellon_values[HA_excellonfile], ""); + pcb_derive_default_filename(PCB->hidlib.loadname, &excellon_values[HA_excellonfile], ""); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 37052) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 37053) @@ -86,7 +86,7 @@ const char *suffix = ".fcd"; const char *val = fidocadj_values[HA_fidocadjfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &fidocadj_values[HA_fidocadjfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &fidocadj_values[HA_fidocadjfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 37052) +++ trunk/src_plugins/export_gcode/gcode.c (revision 37053) @@ -277,7 +277,7 @@ const char *base = gcode_values[HA_outfile].str; gds_t fn; - if (base == NULL) base = gctx.pcb->hidlib.filename; + if (base == NULL) base = gctx.pcb->hidlib.loadname; if (base == NULL) base = "unknown"; gds_init(&fn); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 37052) +++ trunk/src_plugins/export_gerber/gerber.c (revision 37053) @@ -260,7 +260,7 @@ { const char *val = gerber_values[HA_gerberfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &gerber_values[HA_gerberfile], ""); + pcb_derive_default_filename(PCB->hidlib.loadname, &gerber_values[HA_gerberfile], ""); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_hpgl/export_hpgl.c =================================================================== --- trunk/src_plugins/export_hpgl/export_hpgl.c (revision 37052) +++ trunk/src_plugins/export_hpgl/export_hpgl.c (revision 37053) @@ -95,7 +95,7 @@ const char *val = exp_hpgl_values[HA_exp_hpglfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &exp_hpgl_values[HA_exp_hpglfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &exp_hpgl_values[HA_exp_hpglfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 37052) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 37053) @@ -126,7 +126,7 @@ fprintf(ctx->f, "C \n"); fprintf(ctx->f, "C File created on %s\n", utc); fprintf(ctx->f, "C \n"); - fprintf(ctx->f, "P JOB %s\n", (PCB->hidlib.name == NULL) ? PCB->hidlib.filename : PCB->hidlib.name); + fprintf(ctx->f, "P JOB %s\n", (PCB->hidlib.name == NULL) ? PCB->hidlib.loadname : PCB->hidlib.name); fprintf(ctx->f, "P CODE 00\n"); fprintf(ctx->f, "P UNITS CUST %d\n", ctx->is_mil ? 0 : 1); fprintf(ctx->f, "P DIM N\n"); @@ -427,7 +427,7 @@ { const char *val = ipcd356_values[HA_ipcd356_filename].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &ipcd356_values[HA_ipcd356_filename], ".net"); + pcb_derive_default_filename(PCB->hidlib.loadname, &ipcd356_values[HA_ipcd356_filename], ".net"); if (n != NULL) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 37052) +++ trunk/src_plugins/export_openems/export_openems.c (revision 37053) @@ -173,7 +173,7 @@ const char *val = openems_values[HA_openemsfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &openems_values[HA_openemsfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &openems_values[HA_openemsfile], suffix); if (mesh != NULL) { openems_values[HA_def_substrate_thick].crd = mesh->def_subs_thick; Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 37052) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 37053) @@ -137,7 +137,7 @@ const char *val = openscad_values[HA_openscadfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &openscad_values[HA_openscadfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &openscad_values[HA_openscadfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 37052) +++ trunk/src_plugins/export_png/png.c (revision 37053) @@ -302,7 +302,7 @@ const char *val = png_values[HA_pngfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &png_values[HA_pngfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &png_values[HA_pngfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 37052) +++ trunk/src_plugins/export_ps/eps.c (revision 37053) @@ -117,7 +117,7 @@ const char *val = eps_values[HA_psfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &eps_values[HA_psfile], ".eps"); + pcb_derive_default_filename(PCB->hidlib.loadname, &eps_values[HA_psfile], ".eps"); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 37052) +++ trunk/src_plugins/export_ps/ps.c (revision 37053) @@ -320,7 +320,7 @@ const char *val = global.ps_values[HA_psfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &global.ps_values[HA_psfile], ".ps"); + pcb_derive_default_filename(PCB->hidlib.loadname, &global.ps_values[HA_psfile], ".ps"); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 37052) +++ trunk/src_plugins/export_stat/stat.c (revision 37053) @@ -116,7 +116,7 @@ const char *val = stat_values[HA_statfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &stat_values[HA_statfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &stat_values[HA_statfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 37052) +++ trunk/src_plugins/export_stl/export_stl.c (revision 37053) @@ -369,7 +369,7 @@ const char *val = stl_values[HA_stlfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &stl_values[HA_stlfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &stl_values[HA_stlfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 37052) +++ trunk/src_plugins/export_svg/svg.c (revision 37053) @@ -148,7 +148,7 @@ const char *val = svg_values[HA_svgfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &svg_values[HA_svgfile], suffix); + pcb_derive_default_filename(PCB->hidlib.loadname, &svg_values[HA_svgfile], suffix); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c =================================================================== --- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 37052) +++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 37053) @@ -237,14 +237,14 @@ static void pcb_fuse_destroy(void *private_data) { - char *fn = PCB->hidlib.filename; + char *fn = PCB->hidlib.loadname; if (!pcb_fuse_changed) return; /* pwd is lost during daemonisation */ - if (!rnd_is_path_abs(PCB->hidlib.filename)) - fn = rnd_strdup_printf("%s%c%s", fuse_cwd, RND_DIR_SEPARATOR_C, PCB->hidlib.filename); + if (!rnd_is_path_abs(PCB->hidlib.loadname)) + fn = rnd_strdup_printf("%s%c%s", fuse_cwd, RND_DIR_SEPARATOR_C, PCB->hidlib.loadname); if (pcb_save_pcb(fn, NULL) != 0) { fprintf(stderr, "Failed to save the modified board file\n"); Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c =================================================================== --- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 37052) +++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 37053) @@ -96,7 +96,7 @@ exit(1); } gds_uninit(&inp); - if (pcb_save_pcb(PCB->hidlib.filename, NULL) != 0) { + if (pcb_save_pcb(PCB->hidlib.loadname, NULL) != 0) { fprintf(stderr, "Failed to save the modified board file\n"); exit(1); } Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 37052) +++ trunk/src_plugins/export_xy/xy.c (revision 37053) @@ -153,7 +153,7 @@ } if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &xy_values[HA_xyfile], ".xy"); + pcb_derive_default_filename(PCB->hidlib.loadname, &xy_values[HA_xyfile], ".xy"); if (n) *n = NUM_OPTIONS; Index: trunk/src_plugins/import_net_cmd/import_net_cmd.c =================================================================== --- trunk/src_plugins/import_net_cmd/import_net_cmd.c (revision 37052) +++ trunk/src_plugins/import_net_cmd/import_net_cmd.c (revision 37053) @@ -75,8 +75,8 @@ if (verbose) rnd_message(RND_MSG_DEBUG, "import_net_cmd: running cmd: '%s' outfn='%s'\n", cmdline, outfn); - if (PCB->hidlib.filename != NULL) - rnd_setenv("IMPORT_NET_CMD_PCB", PCB->hidlib.filename, 1); + if (PCB->hidlib.loadname != NULL) + rnd_setenv("IMPORT_NET_CMD_PCB", PCB->hidlib.loadname, 1); rnd_setenv("IMPORT_NET_CMD_OUT", outfn, 1); res = rnd_system(&PCB->hidlib, cmdline); if (res == 0) { Index: trunk/src_plugins/io_dsn/export.c =================================================================== --- trunk/src_plugins/io_dsn/export.c (revision 37052) +++ trunk/src_plugins/io_dsn/export.c (revision 37053) @@ -71,7 +71,7 @@ { const char *val = dsn_values[HA_dsnfile].str; if ((PCB != NULL) && ((val == NULL) || (*val == '\0'))) - pcb_derive_default_filename(PCB->hidlib.filename, &dsn_values[HA_dsnfile], ".dsn"); + pcb_derive_default_filename(PCB->hidlib.loadname, &dsn_values[HA_dsnfile], ".dsn"); if (n) *n = NUM_OPTIONS; return dsn_options; Index: trunk/src_plugins/io_hyp/write.c =================================================================== --- trunk/src_plugins/io_hyp/write.c (revision 37052) +++ trunk/src_plugins/io_hyp/write.c (revision 37053) @@ -131,7 +131,7 @@ rnd_print_utc(dt, sizeof(dt), 0); - fprintf(wr->f, "* %s exported by pcb-rnd " PCB_VERSION " (" PCB_REVISION ") on %s\n", wr->pcb->hidlib.filename, dt); + fprintf(wr->f, "* %s exported by pcb-rnd " PCB_VERSION " (" PCB_REVISION ") on %s\n", wr->pcb->hidlib.loadname, dt); fprintf(wr->f, "* Board: %s\n", wr->pcb->hidlib.name); fprintf(wr->f, "{VERSION=2.0}\n"); fprintf(wr->f, "{DATA_MODE=DETAILED}\n"); Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 37052) +++ trunk/src_plugins/io_lihata/read.c (revision 37053) @@ -2444,7 +2444,7 @@ if (rctx->cfg_dest == RND_CFR_invalid) return; if (rnd_conf_insert_tree_as(rctx->cfg_dest, sub) != 0) - rnd_message(RND_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->hidlib.filename); + rnd_message(RND_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->hidlib.loadname); else rnd_conf_update(NULL, -1); } Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 37052) +++ trunk/src_plugins/io_lihata/write.c (revision 37053) @@ -1850,8 +1850,8 @@ char *orig_fn, *end; char *pcb_fn = rnd_strdup_subst(fnpat, rnd_build_fn_cb, &PCB->hidlib, RND_SUBST_ALL); - orig_fn = PCB->hidlib.filename; - PCB->hidlib.filename = NULL; + orig_fn = PCB->hidlib.loadname; + PCB->hidlib.loadname = NULL; /* avoid .lht.lht.pcb */ end = pcb_fn + strlen(pcb_fn) - 1; @@ -1862,8 +1862,8 @@ free(pcb_fn); /* restore these because SaveTo() has changed them */ - free(PCB->hidlib.filename); - PCB->hidlib.filename = orig_fn; + free(PCB->hidlib.loadname); + PCB->hidlib.loadname = orig_fn; PCB->Data->loader = ctx; } } Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 37052) +++ trunk/src_plugins/io_tedax/tetest.c (revision 37053) @@ -191,7 +191,7 @@ { const char *val = tedax_etest_values[HA_outfile].str; if ((PCB != NULL) && (val == NULL)) - pcb_derive_default_filename(PCB->hidlib.filename, &tedax_etest_values[HA_outfile], ".etest.tdx"); + pcb_derive_default_filename(PCB->hidlib.loadname, &tedax_etest_values[HA_outfile], ".etest.tdx"); if (n) *n = NUM_OPTIONS; @@ -219,7 +219,7 @@ name = PCB->hidlib.name; - if (name == NULL) name = PCB->hidlib.filename; + if (name == NULL) name = PCB->hidlib.loadname; if (name == NULL) name = "-"; tedax_etest_save(PCB, name, tedax_etest_filename); pcb_cam_end(&cam); Index: trunk/src_plugins/lib_hid_pcbui/infobar.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 37052) +++ trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 37053) @@ -39,8 +39,8 @@ static void pcb_infobar_brdchg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL); - if ((hidlib != NULL) && (hidlib->filename != NULL)) - last_date = rnd_file_mtime(NULL, PCB->hidlib.filename); + if ((hidlib != NULL) && (hidlib->loadname != NULL)) + last_date = rnd_file_mtime(NULL, PCB->hidlib.loadname); else last_date = -1; } @@ -57,8 +57,8 @@ infobar_timer_active = 0; if (infobar_timer_active) { /* check for file change */ - if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) { - double last_chg = rnd_file_mtime(NULL, PCB->hidlib.filename); + if ((PCB != NULL) && (PCB->hidlib.loadname != NULL)) { + double last_chg = rnd_file_mtime(NULL, PCB->hidlib.loadname); if (last_chg > last_date) { last_date = last_chg; rnd_actionva(&PCB->hidlib, "InfoBarFileChanged", "open", NULL); @@ -89,8 +89,8 @@ static void pcb_infobar_fn_chg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { - if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) { - last_date = rnd_file_mtime(NULL, PCB->hidlib.filename); + if ((PCB != NULL) && (PCB->hidlib.loadname != NULL)) { + last_date = rnd_file_mtime(NULL, PCB->hidlib.loadname); rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL); } } Index: trunk/src_plugins/lib_hid_pcbui/title.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/title.c (revision 37052) +++ trunk/src_plugins/lib_hid_pcbui/title.c (revision 37053) @@ -48,10 +48,10 @@ else name = hl->name; - if ((hl->filename == NULL) || (*hl->filename == '\0')) + if ((hl->loadname == NULL) || (*hl->loadname == '\0')) filename = ""; else - filename = hl->filename; + filename = hl->loadname; title_buf.used = 0; rnd_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", changed ? "*" : "", name, filename, is_footprint ? "footprint" : "board"); Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 37052) +++ trunk/src_plugins/propedit/propsel.c (revision 37053) @@ -127,7 +127,7 @@ static void map_board(pcb_propedit_t *ctx, pcb_board_t *pcb) { map_add_prop(ctx, "p/board/name", String, pcb->hidlib.name); - map_add_prop(ctx, "p/board/filename", String, pcb->hidlib.filename); + map_add_prop(ctx, "p/board/filename", String, pcb->hidlib.loadname); map_add_prop(ctx, "p/board/width", rnd_coord_t, rnd_dwg_get_size_x(&pcb->hidlib)); map_add_prop(ctx, "p/board/height", rnd_coord_t, rnd_dwg_get_size_y(&pcb->hidlib)); map_attr(ctx, &pcb->Attributes); @@ -541,8 +541,8 @@ (pcb_board_change_name(rnd_strdup(st->s)))) DONE; if ((strcmp(pn, "filename") == 0)) { - free(pcb->hidlib.filename); - pcb->hidlib.filename = rnd_strdup(st->s); + free(pcb->hidlib.loadname); + pcb->hidlib.loadname = rnd_strdup(st->s); DONE; } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 37052) +++ trunk/src_plugins/report/report.c (revision 37053) @@ -800,11 +800,11 @@ static fgw_error_t pcb_act_info(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int i, j; - if (!PCB || !PCB->Data || !PCB->hidlib.filename) { + if (!PCB || !PCB->Data || !PCB->hidlib.loadname) { printf("No PCB loaded.\n"); return 0; } - printf("Filename: %s\n", PCB->hidlib.filename); + printf("Filename: %s\n", PCB->hidlib.loadname); rnd_printf("Size: %ml x %ml mils, %mm x %mm mm\n", rnd_dwg_get_size_x(&PCB->hidlib), rnd_dwg_get_size_y(&PCB->hidlib), rnd_dwg_get_size_x(&PCB->hidlib), rnd_dwg_get_size_y(&PCB->hidlib)); for (i = 0; i < PCB_MAX_LAYER; i++) { rnd_layergrp_id_t lg = pcb_layer_get_group(PCB, i); Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 37052) +++ trunk/src_plugins/shand_cmd/command.c (revision 37053) @@ -165,8 +165,8 @@ RND_ACT_MAY_CONVARG(1, FGW_STR, SaveLayout, filename = argv[1].val.str); if (filename == NULL) { - if (PCB->hidlib.filename) { - if (pcb_save_pcb(PCB->hidlib.filename, NULL) == 0) + if (PCB->hidlib.loadname) { + if (pcb_save_pcb(PCB->hidlib.loadname, NULL) == 0) pcb_board_set_changed_flag(PCB, rnd_false); } else @@ -175,8 +175,8 @@ else { if (pcb_save_pcb(filename, NULL) == 0) { pcb_board_set_changed_flag(PCB, rnd_false); - free(PCB->hidlib.filename); - PCB->hidlib.filename = rnd_strdup(filename); + free(PCB->hidlib.loadname); + PCB->hidlib.loadname = rnd_strdup(filename); rnd_event(&PCB->hidlib, RND_EVENT_DESIGN_FN_CHANGED, NULL); } }