Skip to content

[sonic-db-cli] Fix argument parsing skipping namespace #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[sonic-db-cli] Fix argument parsing skipping namespace #1111

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d88348
Fix issue where namespace would not be read
croos12 Nov 18, 2025
389b756
Merge branch 'master' into db_namespace_fix
croos12 Nov 18, 2025
c325722
Merge branch 'master' into db_namespace_fix
croos12 Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions sonic-db-cli/sonic-db-cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@ void parseCliArguments(
Options &options)
{
// Parse argument with getopt https://man7.org/linux/man-pages/man3/getopt.3.html
const char* short_options = "hsnc";
const char* short_options = "hsn:c:";
static struct option long_options[] = {
{"help", optional_argument, NULL, 'h' },
{"unixsocket", optional_argument, NULL, 's' },
{"namespace", optional_argument, NULL, 'n' },
{"container_name", optional_argument, NULL, 'c' },
{"help", no_argument, NULL, 'h' },
{"unixsocket", no_argument, NULL, 's' },
{"namespace", required_argument, NULL, 'n' },
{"container_name", required_argument, NULL, 'c' },
// The last element of the array has to be filled with zeros.
{0, 0, 0, 0 }
};
Expand All @@ -235,10 +235,9 @@ void parseCliArguments(
break;

case 'n':
if (optind < argc)
if (optarg)
{
options.m_namespace = argv[optind];
optind++;
options.m_namespace = optarg;
}
else
{
Expand All @@ -247,10 +246,9 @@ void parseCliArguments(
break;

case 'c':
if (optind < argc)
if (optarg)
{
options.m_container_name = argv[optind];
optind++;
options.m_container_name = optarg;
}
else
{
Expand Down
Loading