[BACK]Return to mansearch.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/mansearch.c between version 1.22 and 1.23

version 1.22, 2014/04/16 21:35:48 version 1.23, 2014/04/17 19:19:54
Line 582 
Line 582 
   
         first = cur = NULL;          first = cur = NULL;
         logic = igncase = toclose = 0;          logic = igncase = toclose = 0;
         toopen = 1;          toopen = NULL != search->sec || NULL != search->arch;
   
         for (i = 0; i < argc; i++) {          for (i = 0; i < argc; i++) {
                 if (0 == strcmp("(", argv[i])) {                  if (0 == strcmp("(", argv[i])) {
Line 651 
Line 651 
         if (toopen || logic || igncase || toclose)          if (toopen || logic || igncase || toclose)
                 goto fail;                  goto fail;
   
         cur->close++;          if (NULL != search->sec || NULL != search->arch)
         cur = exprspec(cur, TYPE_arch, search->arch, "^(%s|any)$");                  cur->close++;
         exprspec(cur, TYPE_sec, search->sec, "^%s$");          if (NULL != search->arch)
                   cur = exprspec(cur, TYPE_arch, search->arch, "^(%s|any)$");
           if (NULL != search->sec)
                   exprspec(cur, TYPE_sec, search->sec, "^%s$");
   
         return(first);          return(first);
   
Line 670 
Line 673 
         char     errbuf[BUFSIZ];          char     errbuf[BUFSIZ];
         char    *cp;          char    *cp;
         int      irc;          int      irc;
   
         if (NULL == value)  
                 return(cur);  
   
         mandoc_asprintf(&cp, format, value);          mandoc_asprintf(&cp, format, value);
         cur->next = mandoc_calloc(1, sizeof(struct expr));          cur->next = mandoc_calloc(1, sizeof(struct expr));
Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23