1 /* $OpenBSD: diff.c,v 1.109 2006/07/08 09:25:44 ray Exp $ */ 2 /* 3 * Copyright (c) 2006 Joris Vink <joris@openbsd.org> 4 * 5 * Permission to use, copy, modify, and distribute this software for any 6 * purpose with or without fee is hereby granted, provided that the above 7 * copyright notice and this permission notice appear in all copies. 8 * 9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 16 */ 17 18 #include "includes.h" 19 20 #include "cvs.h" 21 #include "diff.h" 22 #include "log.h" 23 #include "remote.h" 24 25 void cvs_diff_local(struct cvs_file *); 26 27 static int Nflag = 0; 28 static char *rev1 = NULL; 29 static char *rev2 = NULL; 30 31 struct cvs_cmd cvs_cmd_diff = { 32 CVS_OP_DIFF, 0, "diff", 33 { "di", "dif" }, 34 "Show differences between revisions", 35 "[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] " 36 "[-k mode] [file ...]", 37 "cD:iklNnpr:Ru", 38 NULL, 39 cvs_diff 40 }; 41 42 int 43 cvs_diff(int argc, char **argv) 44 { 45 int ch; 46 char *arg = "."; 47 int flags; 48 struct cvs_recursion cr; 49 50 flags = CR_RECURSE_DIRS; 51 strlcpy(diffargs, argv[0], sizeof(diffargs)); 52 53 while ((ch = getopt(argc, argv, cvs_cmd_diff.cmd_opts)) != -1) { 54 switch (ch) { 55 case 'c': 56 strlcat(diffargs, " -c", sizeof(diffargs)); 57 diff_format = D_CONTEXT; 58 break; 59 case 'l': 60 flags &= ~CR_RECURSE_DIRS; 61 break; 62 case 'n': 63 strlcat(diffargs, " -n", sizeof(diffargs)); 64 diff_format = D_RCSDIFF; 65 break; 66 case 'N': 67 strlcat(diffargs, " -N", sizeof(diffargs)); 68 Nflag = 1; 69 break; 70 case 'p': 71 strlcat(diffargs, " -p", sizeof(diffargs)); 72 diff_pflag = 1; 73 break; 74 case 'r': 75 if (rev1 == NULL) { 76 rev1 = optarg; 77 } else if (rev2 == NULL) { 78 rev2 = optarg; 79 } else { 80 fatal("no more than 2 revisions/dates can" 81 " be specified"); 82 } 83 break; 84 case 'u': 85 strlcat(diffargs, " -u", sizeof(diffargs)); 86 diff_format = D_UNIFIED; 87 break; 88 default: 89 fatal("%s", cvs_cmd_diff.cmd_synopsis); 90 } 91 } 92 93 argc -= optind; 94 argv += optind; 95 96 cr.enterdir = NULL; 97 cr.leavedir = NULL; 98 99 if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { 100 cr.fileproc = cvs_client_sendfile; 101 102 if (!(flags & CR_RECURSE_DIRS)) 103 cvs_client_send_request("Argument -l"); 104 105 switch (diff_format) { 106 case D_CONTEXT: 107 cvs_client_send_request("Argument -c"); 108 break; 109 case D_RCSDIFF: 110 cvs_client_send_request("Argument -n"); 111 break; 112 case D_UNIFIED: 113 cvs_client_send_request("Argument -u"); 114 break; 115 default: 116 break; 117 } 118 119 if (Nflag == 1) 120 cvs_client_send_request("Argument -N"); 121 122 if (diff_pflag == 1) 123 cvs_client_send_request("Argument -p"); 124 125 if (rev1 != NULL) 126 cvs_client_send_request("Argument -r%s", rev1); 127 if (rev2 != NULL) 128 cvs_client_send_request("Argument -r%s", rev2); 129 } else { 130 cr.fileproc = cvs_diff_local; 131 } 132 133 cr.flags = flags; 134 135 diff_rev1 = diff_rev2 = NULL; 136 137 if (argc > 0) 138 cvs_file_run(argc, argv, &cr); 139 else 140 cvs_file_run(1, &arg, &cr); 141 142 if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { 143 cvs_client_send_files(argv, argc); 144 cvs_client_senddir("."); 145 cvs_client_send_request("diff"); 146 cvs_client_get_responses(); 147 } 148 149 return (0); 150 } 151 152 void 153 cvs_diff_local(struct cvs_file *cf) 154 { 155 size_t len; 156 RCSNUM *r1; 157 BUF *b1, *b2; 158 struct stat st; 159 struct timeval tv[2], tv2[2]; 160 char rbuf[16], p1[MAXPATHLEN], p2[MAXPATHLEN]; 161 162 cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path); 163 164 if (cf->file_type == CVS_DIR) { 165 if (verbosity > 1) 166 cvs_log(LP_NOTICE, "Diffing inside %s", cf->file_path); 167 return; 168 } 169 170 cvs_file_classify(cf, NULL, 0); 171 172 if (cf->file_status == FILE_LOST) { 173 cvs_log(LP_ERR, "cannot find file %s", cf->file_path); 174 return; 175 } else if (cf->file_status == FILE_UNKNOWN) { 176 cvs_log(LP_ERR, "I know nothing about %s", cf->file_path); 177 return; 178 } else if (cf->file_status == FILE_ADDED && Nflag == 0) { 179 cvs_log(LP_ERR, "%s is a new entry, no comparison available", 180 cf->file_path); 181 return; 182 } else if (cf->file_status == FILE_REMOVED && Nflag == 0) { 183 cvs_log(LP_ERR, "%s was removed, no comparison available", 184 cf->file_path); 185 return; 186 } else if (cf->file_status == FILE_UPTODATE && rev1 == NULL && 187 rev2 == NULL) { 188 return; 189 } 190 191 if (rev1 != NULL) 192 diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs); 193 if (rev2 != NULL) 194 diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs); 195 196 diff_file = cf->file_path; 197 cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path, 198 RCS_DIFF_DIV, cf->file_rpath); 199 200 if (cf->file_status != FILE_ADDED) { 201 if (diff_rev1 != NULL) 202 r1 = diff_rev1; 203 else 204 r1 = cf->file_ent->ce_rev; 205 206 diff_rev1 = r1; 207 rcsnum_tostr(r1, rbuf , sizeof(rbuf)); 208 cvs_printf("retrieving revision %s\n", rbuf); 209 if ((b1 = rcs_getrev(cf->file_rcs, r1)) == NULL) 210 fatal("failed to retrieve revision %s", rbuf); 211 212 b1 = rcs_kwexp_buf(b1, cf->file_rcs, r1); 213 214 tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1); 215 tv[0].tv_usec = 0; 216 tv[1] = tv[0]; 217 } 218 219 if (diff_rev2 != NULL && cf->file_status != FILE_ADDED && 220 cf->file_status != FILE_REMOVED) { 221 rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf)); 222 cvs_printf("retrieving revision %s\n", rbuf); 223 if ((b2 = rcs_getrev(cf->file_rcs, diff_rev2)) == NULL) 224 fatal("failed to retrieve revision %s", rbuf); 225 226 b2 = rcs_kwexp_buf(b2, cf->file_rcs, diff_rev2); 227 228 tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2); 229 tv2[0].tv_usec = 0; 230 tv2[1] = tv2[0]; 231 } else if (cf->file_status != FILE_REMOVED) { 232 if (fstat(cf->fd, &st) == -1) 233 fatal("fstat failed %s", strerror(errno)); 234 if ((b2 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL) 235 fatal("failed to load %s", cf->file_path); 236 237 st.st_mtime = cvs_hack_time(st.st_mtime, 1); 238 tv2[0].tv_sec = st.st_mtime; 239 tv2[0].tv_usec = 0; 240 tv2[1] = tv2[0]; 241 } 242 243 cvs_printf("%s", diffargs); 244 245 if (cf->file_status != FILE_ADDED) { 246 rcsnum_tostr(r1, rbuf, sizeof(rbuf)); 247 cvs_printf(" -r%s", rbuf); 248 249 if (diff_rev2 != NULL) { 250 rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf)); 251 cvs_printf(" -r%s", rbuf); 252 } 253 } 254 255 cvs_printf(" %s\n", cf->file_path); 256 257 if (cf->file_status != FILE_ADDED) { 258 len = strlcpy(p1, cvs_tmpdir, sizeof(p1)); 259 if (len >= sizeof(p1)) 260 fatal("cvs_diff_local: truncation"); 261 262 len = strlcat(p1, "/diff1.XXXXXXXXXX", sizeof(p1)); 263 if (len >= sizeof(p1)) 264 fatal("cvs_diff_local: truncation"); 265 266 cvs_buf_write_stmp(b1, p1, tv); 267 cvs_buf_free(b1); 268 } else { 269 len = strlcpy(p1, CVS_PATH_DEVNULL, sizeof(p1)); 270 if (len >= sizeof(p1)) 271 fatal("cvs_diff_local: truncation"); 272 } 273 274 if (cf->file_status != FILE_REMOVED) { 275 len = strlcpy(p2, cvs_tmpdir, sizeof(p2)); 276 if (len >= sizeof(p2)) 277 fatal("cvs_diff_local: truncation"); 278 279 len = strlcat(p2, "/diff2.XXXXXXXXXX", sizeof(p2)); 280 if (len >= sizeof(p2)) 281 fatal("cvs_diff_local: truncation"); 282 283 cvs_buf_write_stmp(b2, p2, tv2); 284 cvs_buf_free(b2); 285 } else { 286 len = strlcpy(p2, CVS_PATH_DEVNULL, sizeof(p2)); 287 if (len >= sizeof(p2)) 288 fatal("cvs_diff_local: truncation"); 289 } 290 291 cvs_diffreg(p1, p2, NULL); 292 cvs_worklist_run(&temp_files, cvs_worklist_unlink); 293 294 if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev) 295 rcsnum_free(diff_rev1); 296 if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev) 297 rcsnum_free(diff_rev2); 298 299 diff_rev1 = diff_rev2 = NULL; 300 } 301