=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsdiff.c,v retrieving revision 1.12 retrieving revision 1.13 diff -c -r1.12 -r1.13 *** src/usr.bin/rcs/rcsdiff.c 2005/10/16 12:03:09 1.12 --- src/usr.bin/rcs/rcsdiff.c 2005/10/27 07:43:56 1.13 *************** *** 1,4 **** ! /* $OpenBSD: rcsdiff.c,v 1.12 2005/10/16 12:03:09 niallo Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: rcsdiff.c,v 1.13 2005/10/27 07:43:56 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. *************** *** 165,171 **** return (-1); } ! strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1)); if (cvs_buf_write_stmp(b1, path1, 0600) == -1) { cvs_log(LP_ERRNO, "could not write temporary file"); cvs_buf_free(b1); --- 165,172 ---- return (-1); } ! strlcpy(path1, rcs_tmpdir, sizeof(path1)); ! strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1)); if (cvs_buf_write_stmp(b1, path1, 0600) == -1) { cvs_log(LP_ERRNO, "could not write temporary file"); cvs_buf_free(b1); *************** *** 174,180 **** } cvs_buf_free(b1); ! strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2)); if (cvs_buf_write_stmp(b2, path2, 0600) == -1) { cvs_buf_free(b2); (void)unlink(path1); --- 175,182 ---- } cvs_buf_free(b1); ! strlcpy(path2, rcs_tmpdir, sizeof(path2)); ! strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2)); if (cvs_buf_write_stmp(b2, path2, 0600) == -1) { cvs_buf_free(b2); (void)unlink(path1); *************** *** 214,220 **** return (-1); } ! strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1)); if (cvs_buf_write_stmp(b1, path1, 0600) == -1) { cvs_log(LP_ERRNO, "could not write temporary file"); cvs_buf_free(b1); --- 216,223 ---- return (-1); } ! strlcpy(path1, rcs_tmpdir, sizeof(path1)); ! strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1)); if (cvs_buf_write_stmp(b1, path1, 0600) == -1) { cvs_log(LP_ERRNO, "could not write temporary file"); cvs_buf_free(b1); *************** *** 223,229 **** } cvs_buf_free(b1); ! strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2)); if (cvs_buf_write_stmp(b2, path2, 0600) == -1) { cvs_buf_free(b2); (void)unlink(path1); --- 226,233 ---- } cvs_buf_free(b1); ! strlcpy(path2, rcs_tmpdir, sizeof(path2)); ! strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2)); if (cvs_buf_write_stmp(b2, path2, 0600) == -1) { cvs_buf_free(b2); (void)unlink(path1);