[BACK]Return to manpage.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/Attic/manpage.c between version 1.10 and 1.11

version 1.10, 2015/02/10 08:05:30 version 1.11, 2015/03/27 17:37:25
Line 28 
Line 28 
 #include <string.h>  #include <string.h>
 #include <unistd.h>  #include <unistd.h>
   
 #include "manpath.h"  #include "manconf.h"
 #include "mansearch.h"  #include "mansearch.h"
   
 static  void     show(const char *, const char *);  static  void     show(const char *, const char *);
Line 43  main(int argc, char *argv[])
Line 43  main(int argc, char *argv[])
         char            *conf_file, *defpaths, *auxpaths, *cp;          char            *conf_file, *defpaths, *auxpaths, *cp;
         char             buf[PATH_MAX];          char             buf[PATH_MAX];
         const char      *cmd;          const char      *cmd;
         struct manpaths  paths;          struct manconf   conf;
         char            *progname;          char            *progname;
         extern char     *optarg;          extern char     *optarg;
         extern int       optind;          extern int       optind;
Line 57  main(int argc, char *argv[])
Line 57  main(int argc, char *argv[])
                 ++progname;                  ++progname;
   
         auxpaths = defpaths = conf_file = NULL;          auxpaths = defpaths = conf_file = NULL;
         memset(&paths, 0, sizeof(struct manpaths));          memset(&conf, 0, sizeof(conf));
         memset(&search, 0, sizeof(struct mansearch));          memset(&search, 0, sizeof(struct mansearch));
   
         while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))          while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
Line 90  main(int argc, char *argv[])
Line 90  main(int argc, char *argv[])
         search.outkey = "Nd";          search.outkey = "Nd";
         search.argmode = ARG_EXPR;          search.argmode = ARG_EXPR;
   
         manpath_parse(&paths, conf_file, defpaths, auxpaths);          manconf_parse(&conf, conf_file, defpaths, auxpaths);
         ch = mansearch(&search, &paths, argc, argv, &res, &sz);          ch = mansearch(&search, &conf.manpath, argc, argv, &res, &sz);
         manpath_free(&paths);          manconf_free(&conf);
   
         if (0 == ch)          if (0 == ch)
                 goto usage;                  goto usage;

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

CVSweb