Skip to content

Fixed short options missing from getopt option strings #6262

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
claude wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Fixed short options missing from getopt option strings #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
89d8d81
cf-check: Added missing 'V' to short option string
claude Jul 31, 2026
da0c3f6
cf-execd: Removed stray '1' from short option string
claude Jul 31, 2026
fa793f5
cf-monitord: Removed stray 'S' from short option string
claude Jul 31, 2026
8f1f652
cf-net: Added missing 't:' and 'c:' to short option string
claude Jul 31, 2026
2d43475
cf-promises: Removed stray 'S' and vestigial 'i:' from short option s…
claude Jul 31, 2026
f7817a3
cf-runagent: Removed vestigial 'q:' and stray 'S' from short option s…
claude Jul 31, 2026
4fd98b4
cf-runagent: Added --no-lock long option for existing -K
claude Jul 31, 2026
443c911
cf-secret: Added missing 'v', 'I' and 'g:' to short option string
claude Jul 31, 2026
660af3c
cf-serverd: Fixed -L (--ld-library-path) to consume its argument
claude Jul 31, 2026
9bad591
cf-testd: Added missing 'r:' to short option string
claude Jul 31, 2026
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
2 changes: 1 addition & 1 deletion cf-check/cf-check.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ int main(int argc, const char *const *argv)

int c = 0;
int start_index = 1;
const char *optstr = "+hMg:dvI"; // + means stop for non opt arg. :)
const char *optstr = "+hMVg:dvI"; // + means stop for non opt arg. :)
Comment thread
olehermanse marked this conversation as resolved.
while ((c = getopt_long(argc, (char *const *) argv, optstr, OPTIONS, &start_index))
!= -1)
{
Expand Down
2 changes: 1 addition & 1 deletion cf-execd/cf-execd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ static GenericAgentConfig *CheckOpts(int argc, char **argv)


int longopt_idx;
while ((c = getopt_long(argc, argv, "dvnKIf:g:D:N:VxL:hFOV1gMWC::l",
while ((c = getopt_long(argc, argv, "dvnKIf:g:D:N:VxL:hFOVgMWC::l",
Comment thread
olehermanse marked this conversation as resolved.
OPTIONS, &longopt_idx))
!= -1)
{
Expand Down
2 changes: 1 addition & 1 deletion cf-monitord/cf-monitord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static GenericAgentConfig *CheckOpts(int argc, char **argv)
GenericAgentConfig *config = GenericAgentConfigNewDefault(AGENT_TYPE_MONITOR, GetTTYInteractive());

int longopt_idx;
while ((c = getopt_long(argc, argv, "dvnIf:g:VSxHTKMFhC::l",
while ((c = getopt_long(argc, argv, "dvnIf:g:VxHTKMFhC::l",
Comment thread
olehermanse marked this conversation as resolved.
OPTIONS, &longopt_idx)) != -1)
{
switch (c)
Expand Down
2 changes: 1 addition & 1 deletion cf-net/cf-net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ static int CFNetParse(int argc, char **argv,
*hostnames = NULL;
int c = 0;
int start_index = 1;
const char *optstr = "+hMg:H:p:sdvI"; // + means stop for non opt arg. :)
const char *optstr = "+hMg:H:p:sdvIt:c:"; // + means stop for non opt arg. :)
Comment thread
olehermanse marked this conversation as resolved.
while ((c = getopt_long(argc, argv, optstr, OPTIONS, &start_index))
!= -1)
{
Expand Down
2 changes: 1 addition & 1 deletion cf-promises/cf-promises.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ GenericAgentConfig *CheckOpts(int argc, char **argv)
GenericAgentConfig *config = GenericAgentConfigNewDefault(AGENT_TYPE_COMMON, GetTTYInteractive());

int longopt_idx;
while ((c = getopt_long(argc, argv, "dvnIw:f:g:D:N:VSrxMb:i:p:s:cg:hW:C::T:l",
while ((c = getopt_long(argc, argv, "dvnIw:f:g:D:N:VrxMb:p:s:cg:hW:C::T:l",
Comment thread
olehermanse marked this conversation as resolved.
OPTIONS, &longopt_idx))
!= -1)
{
Expand Down
4 changes: 3 additions & 1 deletion cf-runagent/cf-runagent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ static const struct option OPTIONS[] =
{"verbose", no_argument, 0, 'v'},
{"log-level", required_argument, 0, 'g'},
{"dry-run", no_argument, 0, 'n'},
{"no-lock", no_argument, 0, 'K'},
{"version", no_argument, 0, 'V'},
{"file", required_argument, 0, 'f'},
{"define-class", required_argument, 0, 'D'},
Expand Down Expand Up @@ -138,6 +139,7 @@ static const char *const HINTS[] =
"Output verbose information about the behaviour of cf-runagent",
"Specify how detailed logs should be. Possible values: 'error', 'warning', 'notice', 'info', 'verbose', 'debug'",
"All talk and no action mode - make no changes, only inform of promises not kept",
"Ignore locking constraints during execution (ifelapsed/expireafter) if \"too soon\" to run",
Comment thread
olehermanse marked this conversation as resolved.
"Output the version of the software",
"Specify an alternative input file than the default. This option is overridden by FILE if supplied as argument.",
"Define a list of comma separated classes to be sent to a remote agent",
Expand Down Expand Up @@ -326,7 +328,7 @@ static GenericAgentConfig *CheckOpts(int argc, char **argv)
REMOTEBUNDLES[0] = '\0';

int longopt_idx;
while ((c = getopt_long(argc, argv, "t:q:db::vnKhIif:g:D:VSxo:s:MH:C::l",
while ((c = getopt_long(argc, argv, "t:db::vnKhIif:g:D:Vxo:s:MH:C::l",
Comment thread
olehermanse marked this conversation as resolved.
OPTIONS, &longopt_idx))
!= -1)
{
Expand Down
2 changes: 1 addition & 1 deletion cf-secret/cf-secret.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ int main(int argc, char *argv[])
}

int c = 0;
while ((c = getopt_long(argc - offset, argv + offset, "hMedk:o:H:", OPTIONS, NULL)) != -1)
while ((c = getopt_long(argc - offset, argv + offset, "hMdvIg:k:o:H:", OPTIONS, NULL)) != -1)
Comment thread
olehermanse marked this conversation as resolved.
{
switch (c)
{
Expand Down
2 changes: 1 addition & 1 deletion cf-serverd/cf-serverd-functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ GenericAgentConfig *CheckOpts(int argc, char **argv)
GenericAgentConfig *config = GenericAgentConfigNewDefault(AGENT_TYPE_SERVER, GetTTYInteractive());

int longopt_idx;
while ((c = getopt_long(argc, argv, "dvIKf:g:D:N:VSxLFMhAC::lt::",
while ((c = getopt_long(argc, argv, "dvIKf:g:D:N:VxL:FMhAC::lt::",
Comment thread
olehermanse marked this conversation as resolved.
OPTIONS, &longopt_idx))
!= -1)
{
Expand Down
2 changes: 1 addition & 1 deletion cf-testd/cf-testd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ CFTestD_Config *CFTestD_CheckOpts(int argc, char **argv, long *n_threads)
CFTestD_Config *config = CFTestD_ConfigInit();
assert(config != NULL);

while ((c = getopt_long(argc, argv, "a:df:g:hIj:k:lp:vV", OPTIONS, NULL)) != -1)
while ((c = getopt_long(argc, argv, "a:dg:hIj:k:lp:r:vV", OPTIONS, NULL)) != -1)
Comment thread
olehermanse marked this conversation as resolved.
{
switch (c)
{
Expand Down
Loading