=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v retrieving revision 1.62 retrieving revision 1.63 diff -c -r1.62 -r1.63 *** src/usr.bin/diff/diffreg.c 2005/01/13 08:27:45 1.62 --- src/usr.bin/diff/diffreg.c 2006/02/16 08:15:05 1.63 *************** *** 1,4 **** ! /* $OpenBSD: diffreg.c,v 1.62 2005/01/13 08:27:45 otto Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. --- 1,4 ---- ! /* $OpenBSD: diffreg.c,v 1.63 2006/02/16 08:15:05 otto Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. *************** *** 65,71 **** */ #ifndef lint ! static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.62 2005/01/13 08:27:45 otto Exp $"; #endif /* not lint */ #include --- 65,71 ---- */ #ifndef lint ! static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.63 2006/02/16 08:15:05 otto Exp $"; #endif /* not lint */ #include *************** *** 977,982 **** --- 977,984 ---- line = emalloc(len + 1); if ((nr = pread(fd, line, len, off)) < 0) err(1, "preadline"); + if (nr > 0 && line[nr-1] == '\n') + nr--; line[nr] = '\0'; return (line); }