Differences From Artifact [f8ffd8acb4]:

• File src/main.c — part of check-in [9ac38481ec] at 2023-09-28 18:59:15 on branch find-options-last-arg-fix — Handle --opt=arg as final command line argument, discussed in [forum:a90b5ebd36f4c134]. (user: preben size: 129393)

To Artifact [7a7e030862]:

• File src/main.c — part of check-in [d8b23d71c9] at 2023-09-29 06:56:27 on branch find-options-last-arg-fix — Fixing the long opt broke final short option if expected argument is not present. (user: preben size: 129431) [more...]

1045
1046
1047
1048
1049
1050
1051

1052
1053
1054
1055
1056
1057
1058

      }else if( z[nLong]==0 ){
        if( i+hasArg >= g.argc ) break;
        zReturn = g.argv[i+hasArg];
        remove_from_argv(i, 1+hasArg);
        break;
      }
    }else if( fossil_strcmp(z,zShort)==0 ){

      zReturn = g.argv[i+hasArg];
      remove_from_argv(i, 1+hasArg);
      break;
    }
  }
  return zReturn;
}

>

1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059

      }else if( z[nLong]==0 ){
        if( i+hasArg >= g.argc ) break;
        zReturn = g.argv[i+hasArg];
        remove_from_argv(i, 1+hasArg);
        break;
      }
    }else if( fossil_strcmp(z,zShort)==0 ){
      if( i+hasArg >= g.argc ) break;
      zReturn = g.argv[i+hasArg];
      remove_from_argv(i, 1+hasArg);
      break;
    }
  }
  return zReturn;
}