@@ -1466,7 +1466,6 @@ process(int argc, wchar_t ** argv)
|
1466 | 1466 | wchar_t * p; |
1467 | 1467 | int rc = 0; |
1468 | 1468 | size_t plen; |
1469 | | -size_t slen; |
1470 | 1469 | INSTALLED_PYTHON * ip; |
1471 | 1470 | BOOL valid; |
1472 | 1471 | DWORD size, attrs; |
@@ -1602,10 +1601,11 @@ process(int argc, wchar_t ** argv)
|
1602 | 1601 | else { |
1603 | 1602 | p = argv[1]; |
1604 | 1603 | plen = wcslen(p); |
1605 | | -if (argc == 2) { |
1606 | | -slen = wcslen(L"-0"); |
1607 | | -if(!wcsncmp(p, L"-0", slen)) /* Starts with -0 */ |
1608 | | -valid = show_python_list(argv); /* Check for -0 FIRST */ |
| 1604 | +if ((argc == 2) && |
| 1605 | + (!wcsncmp(p, L"-0", wcslen(L"-0")) || /* Starts with -0 or --list */ |
| 1606 | + !wcsncmp(p, L"--list", wcslen(L"--list")))) |
| 1607 | + { |
| 1608 | +valid = show_python_list(argv); /* Check for -0 or --list FIRST */ |
1609 | 1609 | } |
1610 | 1610 | valid = valid && (*p == L'-') && validate_version(&p[1]); |
1611 | 1611 | if (valid) { |
@@ -1638,10 +1638,13 @@ installed, use -0 for available pythons", &p[1]);
|
1638 | 1638 | if (!valid) { |
1639 | 1639 | if ((argc == 2) && (!_wcsicmp(p, L"-h") || !_wcsicmp(p, L"--help"))) |
1640 | 1640 | show_help_text(argv); |
1641 | | -if ((argc == 2) && (!_wcsicmp(p, L"-0") || !_wcsicmp(p, L"-0p"))) |
1642 | | -executable = NULL; /* Info call only */ |
1643 | | -else |
| 1641 | +if ((argc == 2) && |
| 1642 | +(!_wcsicmp(p, L"-0") || !_wcsicmp(p, L"--list") || |
| 1643 | + !_wcsicmp(p, L"-0p") || !_wcsicmp(p, L"--list-paths"))) |
1644 | 1644 | { |
| 1645 | +executable = NULL; /* Info call only */ |
| 1646 | + } |
| 1647 | +else { |
1645 | 1648 | /* Look for an active virtualenv */ |
1646 | 1649 | executable = find_python_by_venv(); |
1647 | 1650 | |
|