fixed instance loading forget to append basepath.. other path fixes (windows)

[csRadar.git] / csrOpt.h

diff --git a/csrOpt.h b/csrOpt.h
index 9195790ab34253f948eb81853ea79c1d9c6485de..922012295b3b5ad186580014756284ea5a1287c9 100644 (file)
--- a/csrOpt.h
+++ b/csrOpt.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2021 Harry Godden (hgn)
+
+#ifdef CSR_EXECUTABLE
+

 // Supported:
 // -abc
 // -a value
 // Supported:
 // -abc
 // -a value


@@ -42,11 +46,11 @@ int csr_argp( int argc, char *argv[] )
        
                if( *cur != '-' )
                {
        
                if( *cur != '-' )
                {

-                       fprintf( stderr, "Unknown opt '-%c'\n", *cur );
+                       log_error( "Unknown opt '-%c'\n", *cur );

                }
                else
                {
                }
                else
                {

-                       fprintf( stderr, "Unknown opt '--%s'\n", cur + 1 );
+                       log_error( "Unknown opt '--%s'\n", cur + 1 );

                }
                
                exit(0);
                }
                
                exit(0);


@@ -93,7 +97,7 @@ char *csr_opt_arg( char c )
                        }
                }
                
                        }
                }
                

-               fprintf( stderr, "Option '%c' requires argument!\n", c );
+               log_error( "Option '%c' requires argument!\n", c );

                exit(0);
        }
        
                exit(0);
        }
        


@@ -152,7 +156,7 @@ char *csr_long_opt_arg( char *name )
                                }
                                else
                                {
                                }
                                else
                                {

-                                       fprintf( stderr, "Long option '%s' requires argument\n", name );
+                                       log_error( "Long option '%s' requires argument\n", name );

                                }
                        }                       
                }
                                }
                        }                       
                }


@@ -167,9 +171,11 @@ char *csr_arg(void)
        
        if( carg[0] != '-' )
        {
        
        if( carg[0] != '-' )
        {

-               csr_argi ++;
+               csr_consume_next = 1;

                return carg;
        }
        
        return NULL;
 }
                return carg;
        }
        
        return NULL;
 }

+
+#endif