Simplified 'logic' for fopen_ext(), fixing errors with Docker and NEOfixer.

Configuration and temporary files are opened in Find_Orb via fopen_ext().
Its logic has become increasingly illogical over the years;  the new
version is considerably easier to figure out and fixes problems mentioned
in issue #57 and by CSS.  Also took the opportunity to sync some command
line options between 'fo' and Find_Orb.

Author: Bill-Gray

elem_out.cpp

@@ -165,6 +165,7 @@ int save_ephemeris_settings( const ephem_option_t ephemeris_output_options,
 int load_ephemeris_settings( ephem_option_t *ephemeris_output_options,
       int *n_steps, char *obscode, char *step_size, char *ephem_start,
       const char *config);                               /* elem_out.cpp */
+char *default_config_dir_name( char *oname, const char *iname);  /* miscell.c */
 double generate_mc_variant_from_covariance( double *var_orbit,
                                     const double *orbit);    /* orb_func.c */
 void rotate_state_vector_to_current_frame( double *state_vect,
@@ -4058,7 +4059,6 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
    const char *language = get_environment_ptr( "LANGUAGE");
    extern double minimum_jd, maximum_jd;
    extern double maximum_observation_span;
-   extern int use_config_directory;
    extern double automatic_outlier_rejection_limit;
    extern double default_automatic_outlier_rejection_limit;
    extern unsigned max_n_sr_orbits;
@@ -4073,6 +4073,7 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
    const char *outlier_limit = get_environment_ptr( "OUTLIER_REJECTION_LIMIT");
    const char *output_dir = get_environment_ptr( "OUTPUT_DIR");
    extern const char *output_directory;
+   char cospar_name[255];
 
    if( !output_directory && *output_dir)
       output_directory = output_dir;
@@ -4137,13 +4138,9 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
 
       combine_all_observations = "";
       }
-   if( use_config_directory)
-      {
-      char cospar_name[255];
 
-      make_config_dir_name( cospar_name, "cospar.txt");
-      load_cospar_file( cospar_name);
-      }
+   default_config_dir_name( cospar_name, "cospar.txt");
+   load_cospar_file( cospar_name);
    max_n_sr_orbits = atoi( get_environment_ptr( "MAX_SR_ORBITS"));
    if( !max_n_sr_orbits)
       max_n_sr_orbits = 500;

findorb.cpp

@@ -4042,7 +4042,6 @@ int main( int argc, const char **argv)
    extern int monte_carlo_object_count;
    extern char default_comet_magnitude_type;
    extern double max_monte_rms;
-   extern int use_config_directory;          /* miscell.c */
    double max_residual_for_filtering = 2.5;
    bool show_commented_elements = false;
    bool drop_single_obs = true;
@@ -4054,10 +4053,6 @@ int main( int argc, const char **argv)
    mmask_t button = 0;
 
    random_seed = get_random_seed( );
-   if( !strcmp( argv[0], "find_orb"))
-      use_config_directory = true;
-   else
-      use_config_directory = false;
    ensure_config_directory_exists();
    if( !setlocale( LC_ALL, "C.UTF-8"))
       setlocale( LC_ALL, "en_US.utf8");
@@ -4238,6 +4233,13 @@ int main( int argc, const char **argv)
                }
                break;
             case 'x':
+               {
+               extern const char *alt_config_directory;
+
+               alt_config_directory = arg;
+               }
+               break;
+            case 'X':
                {
                extern bool saving_elements_for_reuse;
 
@@ -4251,14 +4253,6 @@ int main( int argc, const char **argv)
                n_extra_full_steps = atoi( arg);
                }
                break;
-            case 'z':
-               {
-               extern const char *alt_config_directory;
-
-               use_config_directory = true;
-               alt_config_directory = arg;
-               }
-               break;
             default:
                printf( "Unknown command-line option '%s'\n", argv[i]);
                return( -1);

fo.cpp

@@ -173,7 +173,6 @@ static int unlink_config_file( const char *filename)
 {
    char buff[255];
    int err_code;
-   extern int use_config_directory;          /* miscell.c */
    extern const char *output_directory;
 
    get_file_name( buff, filename);
@@ -188,7 +187,7 @@ static int unlink_config_file( const char *filename)
       if( err_code)
          fprintf( stderr, "Failed unlinking '%s' ('%s')\n", filename, buff);
       }
-   else if( use_config_directory)
+   else
       {
       char cpath[255];
 
@@ -197,8 +196,6 @@ static int unlink_config_file( const char *filename)
       if( err_code)
          fprintf( stderr, "Failed unlinking '%s'\n", cpath);
       }
-   else
-      err_code = UNLINK( buff);
    if( err_code)
       fprintf( stderr, "Failed unlinking '%s' ('%s')\n", filename, buff);
    return( err_code);
@@ -536,7 +533,6 @@ int main( int argc, const char **argv)
    FILE *summary_ofile = NULL;
    extern int forced_central_body;
    int override_forced_central_body = 0;     /* by default,  all orbits are heliocentric */
-   extern int use_config_directory;          /* miscell.c */
    int element_precision = 5;
    bool use_colors = true;
    bool show_processing_steps = true;
@@ -553,10 +549,6 @@ int main( int argc, const char **argv)
    int child_status;
 #endif
 
-   if( !strcmp( argv[0], "fo"))
-      use_config_directory = true;
-   else
-      use_config_directory = false;
    ensure_config_directory_exists();
    *mpc_codes = '\0';
    if( reset_astrometry_filename( &argc, argv))
@@ -778,7 +770,6 @@ int main( int argc, const char **argv)
                {
                extern const char *alt_config_directory;
 
-               use_config_directory = true;
                alt_config_directory = arg;
                }
                break;
@@ -796,9 +787,6 @@ int main( int argc, const char **argv)
                n_extra_full_steps = atoi( arg);
                }
                break;
-            case 'z':
-               use_config_directory = true;
-               break;
             default:
                printf( "Unknown command-line option '%s'\n", argv[i]);
                return( -1);