- } // search for loop
- if (!found) result.insert(result.end(),"Unknown parameter: "+*akt_p);
- } else { // No -- param, now look for switches
- if (((*akt_p)[0]=='-')&&(free_parms_count==0)){
- int stop_char_loop=0;
- for (unsigned int pos=1; pos<akt_p->length()&& !stop_char_loop ;pos++){
- int found=0;
- for (vector<opt_t>::iterator parm_p=opt_v.begin();parm_p<opt_v.end();parm_p++){
- if (parm_p->shortname[0]==(*akt_p)[pos]){
- found=1;
- (*parm_p->status)=1;
- if (parm_p->target){ // Need argument
- if (akt_p->length()>pos+1){
- *(parm_p->target)=akt_p->substr(pos+1);
- stop_char_loop=1;
- } else { // Word not long enough
- if (akt_p+1<argv.end()) { // If next word existend
- *(parm_p->target)=*(++akt_p);
- stop_char_loop=1;
- } else { // No next word :-(
- result.insert(result.end(),
- "Parameter --"+parm_p->longname+parm_p->placeholder+" needs an Argument!");
- }
- }
- } // arg needed
- } //if match
- } //args loop
- if (!found) result.insert(result.end(),"Unknown switch: "+akt_p->substr(pos,1));
- } // char loop
- }// switch found
- else{ // no switch found
- if (free_parms_count<arg_v.size()){
- *(arg_v[free_parms_count].target)=*akt_p;
- *(arg_v[free_parms_count].status)=1;
- }
+ }
+ if (! found) {
+ messages.insert(messages.begin(),"Unknown option: --"+argstring+"!");
+ found=true; // Oh!
+ }
+ }
+
+ // Look for short parameters
+ if ((argv[arg_no].substr(0,1)=="-")&&(free_parms_count==0)&&(!found)){ // Short parameters
+ found=true;
+ argstring=argv[arg_no].substr(1); // Reassign, with one more character now
+ for (unsigned int pos=0;pos < argstring.length();pos++){
+ bool short_found=false;
+
+ // First, find short switches
+ for (unsigned int switch_no=0;switch_no<option_switches.size();switch_no++){
+ string short_name=option_switches[switch_no].shortname;
+ if (short_name.compare(0,short_name.length(),argstring,pos,short_name.length())==0){
+ *(option_switches[switch_no].status)=1;
+ short_found=true;
+ pos+=short_name.length()-1;
+ }
+ }
+
+ // Now, find short values
+ if (!short_found){
+ for (unsigned int value_no=0;value_no<option_values.size();value_no++){
+ string short_name=option_values[value_no].shortname;
+
+ if (short_name.compare(0,short_name.length(),argstring,pos,short_name.length())==0){
+ if (pos==argstring.length()-1){ // Last character, where's the value?
+ if (arg_no<argv.size()-1){ // Take next complete argument as value!
+ *(option_values[value_no].status)=1;
+ *(option_values[value_no].target)=argv[arg_no+1];
+ arg_no+=1; // Consume the next argument
+ short_found=true;
+ } else { // No argument left!
+ messages.insert(messages.begin(),"Missing value for -"+short_name+"!");
+ short_found=true;
+ }
+ } else {
+ *(option_values[value_no].status)=1;
+ *(option_values[value_no].target)=argstring.substr(pos+1);
+ pos=argstring.length(); // Do not analyse other characters.
+ short_found=true;
+ }
+ }
+ }
+ }
+ if (!short_found) messages.insert(messages.begin(),"Unknown Option: -"+argstring.substr(pos,1)+"!");
+ }
+ }
+
+ if (!found) { // Must be a free form parameter...
+ if (free_parms_count<cmd_args.size()){ // Space available
+ *(cmd_args[free_parms_count].target)=argv[arg_no];
+ *(cmd_args[free_parms_count].status)=1;