Skip to content
Snippets Groups Projects
Commit 4e2bb15d authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

use subgetopt_r

parent 1fadbfa1
No related branches found
No related tags found
No related merge requests found
...@@ -30,12 +30,13 @@ ...@@ -30,12 +30,13 @@
#include <skalibs/djbunix.h> #include <skalibs/djbunix.h>
#include <skalibs/diuint32.h> #include <skalibs/diuint32.h>
#include <skalibs/env.h> #include <skalibs/env.h>
#include <skalibs/sgetopt.h>
#include <execline/execline.h> #include <execline/execline.h>
#include <66/parser.h> #include <66/parser.h>
#include <stdio.h> //#include <stdio.h>
unsigned int VERBOSITY = 1 ; unsigned int VERBOSITY = 1 ;
static stralloc senv = STRALLOC_ZERO ; static stralloc senv = STRALLOC_ZERO ;
...@@ -161,14 +162,14 @@ int main (int argc, char const *const *argv, char const *const *envp) ...@@ -161,14 +162,14 @@ int main (int argc, char const *const *argv, char const *const *envp)
r = i = one = unexport = 0 ; r = i = one = unexport = 0 ;
insist = 1 ; insist = 1 ;
PROG = "66-envfile" ; PROG = "66-envfile" ;
{ {
subgetopt_t l = SUBGETOPT_ZERO ; subgetopt_t l = SUBGETOPT_ZERO ;
for (;;) for (;;)
{ {
int opt = getopt_args(argc,argv, ">hf:l", &l) ; int opt = subgetopt_r(argc,argv, ">hlf:", &l) ;
if (opt == -1) break ; if (opt == -1) break ;
if (opt == -2) strerr_dief1x(110,"options must be set first") ; if (opt == -2) strerr_dief1x(110,"options must be set first") ;
switch (opt) switch (opt)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment