=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v retrieving revision 1.29 retrieving revision 1.30 diff -c -r1.29 -r1.30 *** src/usr.bin/rcs/rcsmerge.c 2006/04/21 14:18:26 1.29 --- src/usr.bin/rcs/rcsmerge.c 2006/04/21 17:17:29 1.30 *************** *** 1,4 **** ! /* $OpenBSD: rcsmerge.c,v 1.29 2006/04/21 14:18:26 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: rcsmerge.c,v 1.30 2006/04/21 17:17:29 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria * All rights reserved. *************** *** 104,110 **** } for (i = 0; i < argc; i++) { ! if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0) continue; if ((file = rcs_open(fpath, RCS_READ)) == NULL) --- 104,110 ---- } for (i = 0; i < argc; i++) { ! if (rcs_statfile(argv[i], fpath, sizeof(fpath), flags) < 0) continue; if ((file = rcs_open(fpath, RCS_READ)) == NULL)