=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v retrieving revision 1.168 retrieving revision 1.169 diff -c -r1.168 -r1.169 *** src/usr.bin/mandoc/main.c 2016/01/08 02:13:35 1.168 --- src/usr.bin/mandoc/main.c 2016/01/08 02:53:09 1.169 *************** *** 1,7 **** ! /* $OpenBSD: main.c,v 1.168 2016/01/08 02:13:35 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons ! * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze * Copyright (c) 2010 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any --- 1,7 ---- ! /* $OpenBSD: main.c,v 1.169 2016/01/08 02:53:09 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons ! * Copyright (c) 2010-2012, 2014-2016 Ingo Schwarze * Copyright (c) 2010 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any *************** *** 115,121 **** size_t isec, i, sz; int prio, best_prio; char sec; - enum mandoclevel rctmp; enum outmode outmode; int fd; int show_usage; --- 115,120 ---- *************** *** 418,428 **** } while (argc > 0) { ! rctmp = mparse_open(curp.mp, &fd, ! resp != NULL ? resp->file : *argv); ! if (rc < rctmp) ! rc = rctmp; ! if (fd != -1) { if (use_pager) { tag_files = tag_init(); --- 417,423 ---- } while (argc > 0) { ! fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); if (fd != -1) { if (use_pager) { tag_files = tag_init(); *************** *** 441,447 **** if (argc > 1 && curp.outtype <= OUTT_UTF8) ascii_sepline(curp.outdata); ! } if (MANDOCLEVEL_OK != rc && curp.wstop) break; --- 436,443 ---- if (argc > 1 && curp.outtype <= OUTT_UTF8) ascii_sepline(curp.outdata); ! } else if (rc < MANDOCLEVEL_ERROR) ! rc = MANDOCLEVEL_ERROR; if (MANDOCLEVEL_OK != rc && curp.wstop) break;