/* Copyright (C) 2007, 2010 Free Software Foundation, Inc. Written by: 2007 Daniel Borca 2010 Slava Zanko 2010 Andrew Borodin 2010 Ilia Maslakov This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include #include #include #include #include #include #include "lib/global.h" #include "lib/tty/tty.h" #include "lib/tty/color.h" #include "lib/tty/key.h" #include "lib/skin.h" /* EDITOR_NORMAL_COLOR */ #include "lib/vfs/mc-vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */ #include "src/cmddef.h" #include "src/keybind.h" #include "src/cmd.h" #include "src/dialog.h" #include "src/help.h" #include "src/wtools.h" #include "src/charsets.h" #include "src/history.h" #include "src/panel.h" /* Needed for current_panel and other_panel */ #include "src/layout.h" /* Needed for get_current_index and get_other_panel */ #include "src/main.h" /* mc_run_mode */ #include "src/selcodepage.h" #include "ydiff.h" #include "internal.h" /*** global variables ****************************************************************************/ const global_keymap_t *diff_map; /*** file scope macro definitions ****************************************************************/ #define g_array_foreach(a, TP, cbf) \ do { \ size_t g_array_foreach_i;\ TP *g_array_foreach_var=NULL; \ for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \ { \ g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \ (*cbf) (g_array_foreach_var); \ } \ } while (0) #define FILE_READ_BUF 4096 #define FILE_FLAG_TEMP (1 << 0) #define OPTX 50 #define OPTY 17 #define ADD_CH '+' #define DEL_CH '-' #define CHG_CH '*' #define EQU_CH ' ' #define HDIFF_ENABLE 1 #define HDIFF_MINCTX 5 #define HDIFF_DEPTH 10 #define TAB_SKIP(ts, pos) ((ts) - (pos) % (ts)) #define FILE_DIRTY(fs) \ do { \ (fs)->pos = 0; \ (fs)->len = 0; \ } while (0) /*** file scope type declarations ****************************************************************/ /*** file scope variables ************************************************************************/ /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ static void dview_set_codeset (WDiff * dview) { #ifdef HAVE_CHARSET const char *encoding_id = NULL; dview->utf8 = TRUE; encoding_id = get_codepage_id (source_codepage >= 0 ? source_codepage : display_codepage); if (encoding_id != NULL) { GIConv conv; conv = str_crt_conv_from (encoding_id); if (conv != INVALID_CONV) { if (dview->converter != str_cnv_from_term) str_close_conv (dview->converter); dview->converter = conv; } dview->utf8 = (gboolean) str_isutf8 (encoding_id); } #else (void) dview; #endif } /* --------------------------------------------------------------------------------------------- */ static void dview_select_encoding (WDiff * dview) { #ifdef HAVE_CHARSET if (do_select_codepage ()) dview_set_codeset (dview); #else (void) dview; #endif } static gboolean rewrite_backup_content (const char *from_file_name, const char *to_file_name) { FILE *backup_fd; char *contents; gsize length; if (!g_file_get_contents (from_file_name, &contents, &length, NULL)) return FALSE; backup_fd = fopen (to_file_name, "w"); if (backup_fd == NULL) { g_free (contents); return FALSE; } fwrite ((const void *) contents, length, 1, backup_fd); fflush (backup_fd); fclose (backup_fd); g_free (contents); return TRUE; } /* buffered I/O ************************************************************* */ /** * Try to open a temporary file. * * \param[out] name address of a pointer to store the temporary name * * \return file descriptor on success, negative on error * * \note the name is not altered if this function fails */ static int open_temp (void **name) { int fd; char *diff_file_name = NULL; fd = mc_mkstemps (&diff_file_name, "mcdiff", NULL); if (fd == -1) { message (D_ERROR, MSG_ERROR, _(" Cannot create temporary diff file \n %s "), unix_error_string (errno)); return -1; } *name = diff_file_name; return fd; } /* --------------------------------------------------------------------------------------------- */ /** * Alocate file structure and associate file descriptor to it. * * \param fd file descriptor * * \return file structure */ static FBUF * f_dopen (int fd) { FBUF *fs; if (fd < 0) return NULL; fs = g_try_malloc (sizeof (FBUF)); if (fs == NULL) return NULL; fs->buf = g_try_malloc (FILE_READ_BUF); if (fs->buf == NULL) { g_free (fs); return NULL; } fs->fd = fd; FILE_DIRTY (fs); fs->flags = 0; fs->data = NULL; return fs; } /* --------------------------------------------------------------------------------------------- */ /** * Free file structure without closing the file. * * \param fs file structure * * \return 0 on success, non-zero on error */ static int f_free (FBUF * fs) { int rv = 0; if (fs->flags & FILE_FLAG_TEMP) { rv = unlink (fs->data); g_free (fs->data); } g_free (fs->buf); g_free (fs); return rv; } /* --------------------------------------------------------------------------------------------- */ /** * Open a binary temporary file in R/W mode. * * \return file structure * * \note the file will be deleted when closed */ static FBUF * f_temp (void) { int fd; FBUF *fs; fs = f_dopen (0); if (fs == NULL) { return NULL; } fd = open_temp (&fs->data); if (fd < 0) { f_free (fs); return NULL; } fs->fd = fd; fs->flags = FILE_FLAG_TEMP; return fs; } /* --------------------------------------------------------------------------------------------- */ /** * Open a binary file in specified mode. * * \param filename file name * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR * * \return file structure */ static FBUF * f_open (const char *filename, int flags) { int fd; FBUF *fs; fs = f_dopen (0); if (fs == NULL) { return NULL; } fd = open (filename, flags); if (fd < 0) { f_free (fs); return NULL; } fs->fd = fd; return fs; } /* --------------------------------------------------------------------------------------------- */ /** * Read a line of bytes from file until newline or EOF. * * \param buf destination buffer * \param size size of buffer * \param fs file structure * * \return number of bytes read * * \note does not stop on null-byte * \note buf will not be null-terminated */ static size_t f_gets (char *buf, size_t size, FBUF * fs) { size_t j = 0; do { int i; int stop = 0; for (i = fs->pos; j < size && i < fs->len && !stop; i++, j++) { buf[j] = fs->buf[i]; if (buf[j] == '\n') { stop = 1; } } fs->pos = i; if (j == size || stop) { break; } fs->pos = 0; fs->len = read (fs->fd, fs->buf, FILE_READ_BUF); } while (fs->len > 0); return j; } /* --------------------------------------------------------------------------------------------- */ /** * Seek into file. * * \param fs file structure * \param off offset * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END * * \return position in file, starting from begginning * * \note avoids thrashing read cache when possible */ static off_t f_seek (FBUF * fs, off_t off, int whence) { off_t rv; if (fs->len && whence != SEEK_END) { rv = lseek (fs->fd, 0, SEEK_CUR); if (rv != -1) { if (whence == SEEK_CUR) { whence = SEEK_SET; off += rv - fs->len + fs->pos; } if (off - rv >= -fs->len && off - rv <= 0) { fs->pos = fs->len + off - rv; return off; } } } rv = lseek (fs->fd, off, whence); if (rv != -1) { FILE_DIRTY (fs); } return rv; } /* --------------------------------------------------------------------------------------------- */ /** * Seek to the beginning of file, thrashing read cache. * * \param fs file structure * * \return 0 if success, non-zero on error */ static off_t f_reset (FBUF * fs) { off_t rv = lseek (fs->fd, 0, SEEK_SET); if (rv != -1) { FILE_DIRTY (fs); } return rv; } /* --------------------------------------------------------------------------------------------- */ /** * Write bytes to file. * * \param fs file structure * \param buf source buffer * \param size size of buffer * * \return number of written bytes, -1 on error * * \note thrashes read cache */ static ssize_t f_write (FBUF * fs, const char *buf, size_t size) { ssize_t rv = write (fs->fd, buf, size); if (rv >= 0) { FILE_DIRTY (fs); } return rv; } /* --------------------------------------------------------------------------------------------- */ /** * Truncate file to the current position. * * \param fs file structure * * \return current file size on success, negative on error * * \note thrashes read cache */ static off_t f_trunc (FBUF * fs) { off_t off = lseek (fs->fd, 0, SEEK_CUR); if (off != -1) { int rv = ftruncate (fs->fd, off); if (rv != 0) { off = -1; } else { FILE_DIRTY (fs); } } return off; } /* --------------------------------------------------------------------------------------------- */ /** * Close file. * * \param fs file structure * * \return 0 on success, non-zero on error * * \note if this is temporary file, it is deleted */ static int f_close (FBUF * fs) { int rv = close (fs->fd); f_free (fs); return rv; } /* --------------------------------------------------------------------------------------------- */ /** * Create pipe stream to process. * * \param cmd shell command line * \param flags open mode, either O_RDONLY or O_WRONLY * * \return file structure */ static FBUF * p_open (const char *cmd, int flags) { FILE *f; FBUF *fs; const char *type = NULL; if (flags == O_RDONLY) { type = "r"; } if (flags == O_WRONLY) { type = "w"; } if (type == NULL) { return NULL; } fs = f_dopen (0); if (fs == NULL) { return NULL; } f = popen (cmd, type); if (f == NULL) { f_free (fs); return NULL; } fs->fd = fileno (f); fs->data = f; return fs; } /* --------------------------------------------------------------------------------------------- */ /** * Close pipe stream. * * \param fs structure * * \return 0 on success, non-zero on error */ static int p_close (FBUF * fs) { int rv = pclose (fs->data); f_free (fs); return rv; } /** * Get one char (byte) from string * * \param char * str, gboolean * result * * \return int as character or 0 and result == FALSE if fail */ static int dview_get_byte (char * str, gboolean * result) { if (str == NULL) { *result = FALSE; return 0; } *result = TRUE; return (unsigned char) *str; } /** * Get utf multibyte char from string * * \param char * str, int * char_width, gboolean * result * * \return int as utf character or 0 and result == FALSE if fail */ static int dview_get_utf (char * str, int * char_width, gboolean * result) { int res = -1; gunichar ch; gchar *next_ch = NULL; int width = 0; *result = TRUE; if (str == NULL) { *result = FALSE; width = 0; return 0; } res = g_utf8_get_char_validated (str, -1); if (res < 0) { ch = *str; width = 0; } else { ch = res; /* Calculate UTF-8 char width */ next_ch = g_utf8_next_char (str); if (next_ch) { width = next_ch - str; } else { ch = 0; width = 0; } } *char_width = width; return ch; } static int dview_str_utf8_offset_to_pos (const char *text, size_t length) { ptrdiff_t result; if (text == NULL || text[0] == '\0') return length; if (g_utf8_validate (text, -1, NULL)) { result = g_utf8_offset_to_pointer (text, length) - text; } else { gunichar uni; char *tmpbuf, *buffer; buffer = tmpbuf = g_strdup (text); while (tmpbuf[0] != '\0') { uni = g_utf8_get_char_validated (tmpbuf, -1); if ((uni != (gunichar) (-1)) && (uni != (gunichar) (-2))) { tmpbuf = g_utf8_next_char (tmpbuf); } else { tmpbuf[0] = '.'; tmpbuf++; } } result = g_utf8_offset_to_pointer (tmpbuf, length) - tmpbuf; g_free (buffer); } return max (length, (size_t) result); } /* --------------------------------------------------------------------------------------------- */ /* diff parse *************************************************************** */ /** * Read decimal number from string. * * \param[in,out] str string to parse * \param[out] n extracted number * * \return 0 if success, otherwise non-zero */ static int scan_deci (const char **str, int *n) { const char *p = *str; char *q; errno = 0; *n = strtol (p, &q, 10); if (errno || p == q) { return -1; } *str = q; return 0; } /* --------------------------------------------------------------------------------------------- */ /** * Parse line for diff statement. * * \param p string to parse * \param ops list of diff statements * * \return 0 if success, otherwise non-zero */ static int scan_line (const char *p, GArray * ops) { DIFFCMD op; int f1, f2; int t1, t2; int cmd; int range; /* handle the following cases: * NUMaNUM[,NUM] * NUM[,NUM]cNUM[,NUM] * NUM[,NUM]dNUM * where NUM is a positive integer */ if (scan_deci (&p, &f1) != 0 || f1 < 0) { return -1; } f2 = f1; range = 0; if (*p == ',') { p++; if (scan_deci (&p, &f2) != 0 || f2 < f1) { return -1; } range = 1; } cmd = *p++; if (cmd == 'a') { if (range) { return -1; } } else if (cmd != 'c' && cmd != 'd') { return -1; } if (scan_deci (&p, &t1) != 0 || t1 < 0) { return -1; } t2 = t1; range = 0; if (*p == ',') { p++; if (scan_deci (&p, &t2) != 0 || t2 < t1) { return -1; } range = 1; } if (cmd == 'd') { if (range) { return -1; } } op.a[0][0] = f1; op.a[0][1] = f2; op.cmd = cmd; op.a[1][0] = t1; op.a[1][1] = t2; g_array_append_val (ops, op); return 0; } /* --------------------------------------------------------------------------------------------- */ /** * Parse diff output and extract diff statements. * * \param f stream to read from * \param ops list of diff statements to fill * * \return positive number indicating number of hunks, otherwise negative */ static int scan_diff (FBUF * f, GArray * ops) { int sz; char buf[BUFSIZ]; while ((sz = f_gets (buf, sizeof (buf) - 1, f))) { if (isdigit (buf[0])) { if (buf[sz - 1] != '\n') { return -1; } buf[sz] = '\0'; if (scan_line (buf, ops) != 0) { return -1; } continue; } while (buf[sz - 1] != '\n' && (sz = f_gets (buf, sizeof (buf), f))) { } } return ops->len; } /* --------------------------------------------------------------------------------------------- */ /** * Invoke diff and extract diff statements. * * \param args extra arguments to be passed to diff * \param extra more arguments to be passed to diff * \param file1 first file to compare * \param file2 second file to compare * \param ops list of diff statements to fill * * \return positive number indicating number of hunks, otherwise negative */ static int dff_execute (const char *args, const char *extra, const char *file1, const char *file2, GArray * ops) { static const char *opt = " --old-group-format='%df%(f=l?:,%dl)d%dE\n'" " --new-group-format='%dea%dF%(F=L?:,%dL)\n'" " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'" " --unchanged-group-format=''"; int rv; FBUF *f; char *cmd; int code; cmd = g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args, extra, opt, file1, file2); if (cmd == NULL) return -1; f = p_open (cmd, O_RDONLY); g_free (cmd); if (f == NULL) return -1; rv = scan_diff (f, ops); code = p_close (f); if (rv < 0 || code == -1 || !WIFEXITED (code) || WEXITSTATUS (code) == 2) return -1; return rv; } /* --------------------------------------------------------------------------------------------- */ /** * Reparse and display file according to diff statements. * * \param ord 0 if displaying first file, 1 if displaying 2nd file * \param filename file name to display * \param ops list of diff statements * \param printer printf-like function to be used for displaying * \param ctx printer context * * \return 0 if success, otherwise non-zero */ static int dff_reparse (int ord, const char *filename, const GArray * ops, DFUNC printer, void *ctx) { size_t i; FBUF *f; size_t sz; char buf[BUFSIZ]; int line = 0; off_t off = 0; const DIFFCMD *op; int eff; int add_cmd; int del_cmd; f = f_open (filename, O_RDONLY); if (f == NULL) { return -1; } ord &= 1; eff = ord; add_cmd = 'a'; del_cmd = 'd'; if (ord) { add_cmd = 'd'; del_cmd = 'a'; } #define F1 a[eff][0] #define F2 a[eff][1] #define T1 a[ ord^1 ][0] #define T2 a[ ord^1 ][1] for (i = 0; i < ops->len; i++) { int n; op = &g_array_index (ops, DIFFCMD, i); n = op->F1 - (op->cmd != add_cmd); while (line < n && (sz = f_gets (buf, sizeof (buf), f))) { line++; printer (ctx, EQU_CH, line, off, sz, buf); off += sz; while (buf[sz - 1] != '\n') { if (!(sz = f_gets (buf, sizeof (buf), f))) { printer (ctx, 0, 0, 0, 1, "\n"); break; } printer (ctx, 0, 0, 0, sz, buf); off += sz; } } if (line != n) { goto err; } if (op->cmd == add_cmd) { n = op->T2 - op->T1 + 1; while (n) { printer (ctx, DEL_CH, 0, 0, 1, "\n"); n--; } } if (op->cmd == del_cmd) { n = op->F2 - op->F1 + 1; while (n && (sz = f_gets (buf, sizeof (buf), f))) { line++; printer (ctx, ADD_CH, line, off, sz, buf); off += sz; while (buf[sz - 1] != '\n') { if (!(sz = f_gets (buf, sizeof (buf), f))) { printer (ctx, 0, 0, 0, 1, "\n"); break; } printer (ctx, 0, 0, 0, sz, buf); off += sz; } n--; } if (n) { goto err; } } if (op->cmd == 'c') { n = op->F2 - op->F1 + 1; while (n && (sz = f_gets (buf, sizeof (buf), f))) { line++; printer (ctx, CHG_CH, line, off, sz, buf); off += sz; while (buf[sz - 1] != '\n') { if (!(sz = f_gets (buf, sizeof (buf), f))) { printer (ctx, 0, 0, 0, 1, "\n"); break; } printer (ctx, 0, 0, 0, sz, buf); off += sz; } n--; } if (n) { goto err; } n = op->T2 - op->T1 - (op->F2 - op->F1); while (n > 0) { printer (ctx, CHG_CH, 0, 0, 1, "\n"); n--; } } } #undef T2 #undef T1 #undef F2 #undef F1 while ((sz = f_gets (buf, sizeof (buf), f))) { line++; printer (ctx, EQU_CH, line, off, sz, buf); off += sz; while (buf[sz - 1] != '\n') { if (!(sz = f_gets (buf, sizeof (buf), f))) { printer (ctx, 0, 0, 0, 1, "\n"); break; } printer (ctx, 0, 0, 0, sz, buf); off += sz; } } f_close (f); return 0; err: f_close (f); return -1; } /* --------------------------------------------------------------------------------------------- */ /* horizontal diff ********************************************************** */ /** * Longest common substring. * * \param s first string * \param m length of first string * \param t second string * \param n length of second string * \param ret list of offsets for longest common substrings inside each string * \param min minimum length of common substrings * * \return 0 if success, nonzero otherwise */ static int lcsubstr (const char *s, int m, const char *t, int n, GArray * ret, int min) { int i, j; int *Lprev, *Lcurr; int z = 0; if (m < min || n < min) { /* XXX early culling */ return 0; } Lprev = g_new0 (int, n + 1); Lcurr = g_new0 (int, n + 1); if (Lprev == NULL || Lcurr == NULL) { g_free (Lprev); g_free (Lcurr); return -1; } for (i = 0; i < m; i++) { int *L = Lprev; Lprev = Lcurr; Lcurr = L; #ifdef USE_MEMSET_IN_LCS memset (Lcurr, 0, (n + 1) * sizeof (int)); #endif for (j = 0; j < n; j++) { #ifndef USE_MEMSET_IN_LCS Lcurr[j + 1] = 0; #endif if (s[i] == t[j]) { int v = Lprev[j] + 1; Lcurr[j + 1] = v; if (z < v) { z = v; g_array_set_size (ret, 0); } if (z == v && z >= min) { int off0 = i - z + 1; int off1 = j - z + 1; size_t k; for (k = 0; k < ret->len; k++) { PAIR *p = (PAIR *) g_array_index (ret, PAIR, k); if ((*p)[0] == off0) { break; } if ((*p)[1] == off1) { break; } } if (k == ret->len) { PAIR p2; p2[0] = off0; p2[1] = off1; g_array_append_val (ret, p2); } } } } } free (Lcurr); free (Lprev); return z; free (Lcurr); free (Lprev); return -1; } /* --------------------------------------------------------------------------------------------- */ /** * Scan recursively for common substrings and build ranges. * * \param s first string * \param t second string * \param bracket current limits for both of the strings * \param min minimum length of common substrings * \param hdiff list of horizontal diff ranges to fill * \param depth recursion depth * * \return 0 if success, nonzero otherwise */ static gboolean hdiff_multi (const char *s, const char *t, const BRACKET bracket, int min, GArray * hdiff, unsigned int depth) { BRACKET p; if (depth--) { GArray *ret; BRACKET b; int len; ret = g_array_new (FALSE, TRUE, sizeof (PAIR)); if (ret == NULL) return FALSE; len = lcsubstr (s + bracket[0].off, bracket[0].len, t + bracket[1].off, bracket[1].len, ret, min); if (ret->len) { size_t k = 0; const PAIR *data = (const PAIR *) &g_array_index (ret, PAIR, 0); const PAIR *data2; b[0].off = bracket[0].off; b[0].len = (*data)[0]; b[1].off = bracket[1].off; b[1].len = (*data)[1]; if (!hdiff_multi (s, t, b, min, hdiff, depth)) return FALSE; for (k = 0; k < ret->len - 1; k++) { data = (const PAIR *) &g_array_index (ret, PAIR, k); data2 = (const PAIR *) &g_array_index (ret, PAIR, k + 1); b[0].off = bracket[0].off + (*data)[0] + len; b[0].len = (*data2)[0] - (*data)[0] - len; b[1].off = bracket[1].off + (*data)[1] + len; b[1].len = (*data2)[1] - (*data)[1] - len; if (!hdiff_multi (s, t, b, min, hdiff, depth)) return FALSE; } data = (const PAIR *) &g_array_index (ret, PAIR, k); b[0].off = bracket[0].off + (*data)[0] + len; b[0].len = bracket[0].len - (*data)[0] - len; b[1].off = bracket[1].off + (*data)[1] + len; b[1].len = bracket[1].len - (*data)[1] - len; if (!hdiff_multi (s, t, b, min, hdiff, depth)) return FALSE; g_array_free (ret, TRUE); return TRUE; } } p[0].off = bracket[0].off; p[0].len = bracket[0].len; p[1].off = bracket[1].off; p[1].len = bracket[1].len; g_array_append_val (hdiff, p); return TRUE; } /* --------------------------------------------------------------------------------------------- */ /** * Build list of horizontal diff ranges. * * \param s first string * \param m length of first string * \param t second string * \param n length of second string * \param min minimum length of common substrings * \param hdiff list of horizontal diff ranges to fill * \param depth recursion depth * * \return 0 if success, nonzero otherwise */ static gboolean hdiff_scan (const char *s, int m, const char *t, int n, int min, GArray * hdiff, unsigned int depth) { int i; BRACKET b; /* dumbscan (single horizontal diff) -- does not compress whitespace */ for (i = 0; i < m && i < n && s[i] == t[i]; i++); for (; m > i && n > i && s[m - 1] == t[n - 1]; m--, n--); b[0].off = i; b[0].len = m - i; b[1].off = i; b[1].len = n - i; /* smartscan (multiple horizontal diff) */ return hdiff_multi (s, t, b, min, hdiff, depth); } /* --------------------------------------------------------------------------------------------- */ /* read line **************************************************************** */ /** * Check if character is inside horizontal diff limits. * * \param k rank of character inside line * \param hdiff horizontal diff structure * \param ord 0 if reading from first file, 1 if reading from 2nd file * * \return TRUE if inside hdiff limits, FALSE otherwise */ static int is_inside (int k, GArray * hdiff, int ord) { size_t i; BRACKET *b; for (i = 0; i < hdiff->len; i++) { int start, end; b = &g_array_index (hdiff, BRACKET, i); start = (*b)[ord].off; end = start + (*b)[ord].len; if (k >= start && k < end) { return 1; } } return 0; } /* --------------------------------------------------------------------------------------------- */ /** * Copy `src' to `dst' expanding tabs. * * \param dst destination buffer * \param src source buffer * \param srcsize size of src buffer * \param base virtual base of this string, needed to calculate tabs * \param ts tab size * * \return new virtual base * * \note The procedure returns when all bytes are consumed from `src' */ static int cvt_cpy (char *dst, const char *src, size_t srcsize, int base, int ts) { int i; for (i = 0; srcsize; i++, src++, dst++, srcsize--) { *dst = *src; if (*src == '\t') { int j = TAB_SKIP (ts, i + base); i += j - 1; while (j-- > 0) { *dst++ = ' '; } dst--; } } return i + base; } /* --------------------------------------------------------------------------------------------- */ /** * Copy `src' to `dst' expanding tabs. * * \param dst destination buffer * \param dstsize size of dst buffer * \param[in,out] _src source buffer * \param srcsize size of src buffer * \param base virtual base of this string, needed to calculate tabs * \param ts tab size * * \return new virtual base * * \note The procedure returns when all bytes are consumed from `src' * or `dstsize' bytes are written to `dst' * \note Upon return, `src' points to the first unwritten character in source */ static int cvt_ncpy (char *dst, int dstsize, const char **_src, size_t srcsize, int base, int ts) { int i; const char *src = *_src; for (i = 0; i < dstsize && srcsize; i++, src++, dst++, srcsize--) { *dst = *src; if (*src == '\t') { int j = TAB_SKIP (ts, i + base); if (j > dstsize - i) { j = dstsize - i; } i += j - 1; while (j-- > 0) { *dst++ = ' '; } dst--; } } *_src = src; return i + base; } /* --------------------------------------------------------------------------------------------- */ /** * Read line from memory, converting tabs to spaces and padding with spaces. * * \param src buffer to read from * \param srcsize size of src buffer * \param dst buffer to read to * \param dstsize size of dst buffer, excluding trailing null * \param skip number of characters to skip * \param ts tab size * \param show_cr show trailing carriage return as ^M * * \return negative on error, otherwise number of bytes except padding */ static int cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr) { int sz = 0; if (src != NULL) { int i; char *tmp = dst; const int base = 0; for (i = 0; dstsize && srcsize && *src != '\n'; i++, src++, srcsize--) { if (*src == '\t') { int j = TAB_SKIP (ts, i + base); i += j - 1; while (j-- > 0) { if (skip > 0) { skip--; } else if (dstsize) { dstsize--; *dst++ = ' '; } } } else if (src[0] == '\r' && (srcsize == 1 || src[1] == '\n')) { if (skip == 0 && show_cr) { if (dstsize > 1) { dstsize -= 2; *dst++ = '^'; *dst++ = 'M'; } else { dstsize--; *dst++ = '.'; } } break; } else { if (skip > 0) { int utf_ch = 0; gboolean res; int w; skip--; utf_ch = dview_get_utf ((char *)src, &w, &res); if (w > 1) skip += w - 1; if (!g_unichar_isprint (utf_ch)) utf_ch = '.'; } else { dstsize--; *dst++ = *src; } } } sz = dst - tmp; } while (dstsize) { dstsize--; *dst++ = ' '; } *dst = '\0'; return sz; } /* --------------------------------------------------------------------------------------------- */ /** * Read line from memory and build attribute array. * * \param src buffer to read from * \param srcsize size of src buffer * \param dst buffer to read to * \param dstsize size of dst buffer, excluding trailing null * \param skip number of characters to skip * \param ts tab size * \param show_cr show trailing carriage return as ^M * \param hdiff horizontal diff structure * \param ord 0 if reading from first file, 1 if reading from 2nd file * \param att buffer of attributes * * \return negative on error, otherwise number of bytes except padding */ static int cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr, GArray * hdiff, int ord, char *att) { int sz = 0; if (src != NULL) { int i, k; char *tmp = dst; const int base = 0; for (i = 0, k = 0; dstsize && srcsize && *src != '\n'; i++, k++, src++, srcsize--) { if (*src == '\t') { int j = TAB_SKIP (ts, i + base); i += j - 1; while (j-- > 0) { if (skip) { skip--; } else if (dstsize) { dstsize--; *att++ = is_inside (k, hdiff, ord); *dst++ = ' '; } } } else if (src[0] == '\r' && (srcsize == 1 || src[1] == '\n')) { if (!skip && show_cr) { if (dstsize > 1) { dstsize -= 2; *att++ = is_inside (k, hdiff, ord); *dst++ = '^'; *att++ = is_inside (k, hdiff, ord); *dst++ = 'M'; } else { dstsize--; *att++ = is_inside (k, hdiff, ord); *dst++ = '.'; } } break; } else { if (skip) { int utf_ch = 0; gboolean res; int w; skip--; utf_ch = dview_get_utf ((char *) src, &w, &res); if (w > 1) skip += w - 1; if (!g_unichar_isprint (utf_ch)) utf_ch = '.'; } else { dstsize--; *att++ = is_inside (k, hdiff, ord); *dst++ = *src; } } } sz = dst - tmp; } while (dstsize) { dstsize--; *att++ = 0; *dst++ = ' '; } *dst = '\0'; return sz; } /* --------------------------------------------------------------------------------------------- */ /** * Read line from file, converting tabs to spaces and padding with spaces. * * \param f file stream to read from * \param off offset of line inside file * \param dst buffer to read to * \param dstsize size of dst buffer, excluding trailing null * \param skip number of characters to skip * \param ts tab size * \param show_cr show trailing carriage return as ^M * * \return negative on error, otherwise number of bytes except padding */ static int cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, int show_cr) { int base = 0; int old_base = base; const int amount = dstsize; size_t useful, offset; size_t i; size_t sz; int lastch = '\0'; const char *q = NULL; char tmp[BUFSIZ]; /* XXX capacity must be >= max{dstsize + 1, amount} */ char cvt[BUFSIZ]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */ if ((int) sizeof (tmp) < amount || (int) sizeof (tmp) <= dstsize || (int) sizeof (cvt) < 8 * amount) { /* abnormal, but avoid buffer overflow */ memset (dst, ' ', dstsize); dst[dstsize] = '\0'; return 0; } f_seek (f, off, SEEK_SET); while (skip > base) { old_base = base; if (!(sz = f_gets (tmp, amount, f))) { break; } base = cvt_cpy (cvt, tmp, sz, old_base, ts); if (cvt[base - old_base - 1] == '\n') { q = &cvt[base - old_base - 1]; base = old_base + q - cvt + 1; break; } } useful = base - skip; offset = skip - old_base; if (useful < 0) { memset (dst, ' ', dstsize); dst[dstsize] = '\0'; return 0; } if (useful <= dstsize) { if (useful) { memmove (dst, cvt + offset, useful); } if (q == NULL && (sz = f_gets (tmp, dstsize - useful + 1, f))) { const char *ptr = tmp; useful += cvt_ncpy (dst + useful, dstsize - useful, &ptr, sz, base, ts) - base; if (ptr < tmp + sz) { lastch = *ptr; } } sz = useful; } else { memmove (dst, cvt + offset, dstsize); sz = dstsize; lastch = cvt[offset + dstsize]; } dst[sz] = lastch; for (i = 0; i < sz && dst[i] != '\n'; i++) { if (dst[i] == '\r' && dst[i + 1] == '\n') { if (show_cr) { if (i + 1 < dstsize) { dst[i++] = '^'; dst[i++] = 'M'; } else { dst[i++] = '*'; } } break; } } for (; i < dstsize; i++) { dst[i] = ' '; } dst[i] = '\0'; return sz; } /* --------------------------------------------------------------------------------------------- */ /* diff printers et al ****************************************************** */ static void cc_free_elt (void *elt) { DIFFLN *p = elt; if (p != NULL) { g_free (p->p); } } /* --------------------------------------------------------------------------------------------- */ static int printer (void *ctx, int ch, int line, off_t off, size_t sz, const char *str) { GArray *a = ((PRINTER_CTX *) ctx)->a; DSRC dsrc = ((PRINTER_CTX *) ctx)->dsrc; if (ch) { DIFFLN p; p.p = NULL; p.ch = ch; p.line = line; p.u.off = off; if (dsrc == DATA_SRC_MEM && line) { if (sz && str[sz - 1] == '\n') { sz--; } if (sz > 0) p.p = g_strndup (str, sz); p.u.len = sz; } g_array_append_val (a, p); } else if (dsrc == DATA_SRC_MEM) { DIFFLN *p; p = &g_array_index (a, DIFFLN, a->len - 1); if (sz && str[sz - 1] == '\n') { sz--; } if (sz > 0) { size_t new_size = p->u.len + sz; char *q = g_realloc (p->p, new_size); memcpy (q + p->u.len, str, sz); p->p = q; } p->u.len += sz; } if (dsrc == DATA_SRC_TMP && (line || !ch)) { FBUF *f = ((PRINTER_CTX *) ctx)->f; f_write (f, str, sz); } return 0; } /* --------------------------------------------------------------------------------------------- */ static int redo_diff (WDiff * dview) { FBUF *const *f = dview->f; PRINTER_CTX ctx; GArray *ops; int ndiff; int rv; char extra[256]; extra[0] = '\0'; if (dview->opt.quality == 2) { strcat (extra, " -d"); } if (dview->opt.quality == 1) { strcat (extra, " --speed-large-files"); } if (dview->opt.strip_trailing_cr) { strcat (extra, " --strip-trailing-cr"); } if (dview->opt.ignore_tab_expansion) { strcat (extra, " -E"); } if (dview->opt.ignore_space_change) { strcat (extra, " -b"); } if (dview->opt.ignore_all_space) { strcat (extra, " -w"); } if (dview->opt.ignore_case) { strcat (extra, " -i"); } if (dview->dsrc != DATA_SRC_MEM) { f_reset (f[0]); f_reset (f[1]); } ops = g_array_new (FALSE, FALSE, sizeof (DIFFCMD)); ndiff = dff_execute (dview->args, extra, dview->file[0], dview->file[1], ops); if (ndiff < 0) { g_array_free (ops, TRUE); return -1; } ctx.dsrc = dview->dsrc; rv = 0; ctx.a = dview->a[0]; ctx.f = f[0]; rv |= dff_reparse (0, dview->file[0], ops, printer, &ctx); ctx.a = dview->a[1]; ctx.f = f[1]; rv |= dff_reparse (1, dview->file[1], ops, printer, &ctx); g_array_free (ops, TRUE); if (rv != 0 || dview->a[0]->len != dview->a[1]->len) return -1; if (dview->dsrc == DATA_SRC_TMP) { f_trunc (f[0]); f_trunc (f[1]); } if (dview->dsrc == DATA_SRC_MEM && HDIFF_ENABLE) { dview->hdiff = g_ptr_array_new (); if (dview->hdiff != NULL) { size_t i; const DIFFLN *p; const DIFFLN *q; for (i = 0; i < dview->a[0]->len; i++) { GArray *h = NULL; p = &g_array_index (dview->a[0], DIFFLN, i); q = &g_array_index (dview->a[1], DIFFLN, i); if (p->line && q->line && p->ch == CHG_CH) { h = g_array_new (FALSE, FALSE, sizeof (BRACKET)); if (h != NULL) { gboolean runresult = hdiff_scan (p->p, p->u.len, q->p, q->u.len, HDIFF_MINCTX, h, HDIFF_DEPTH); if (!runresult) { g_array_free (h, TRUE); h = NULL; } } } g_ptr_array_add (dview->hdiff, h); } } } return ndiff; } /* --------------------------------------------------------------------------------------------- */ static void destroy_hdiff (WDiff * dview) { if (dview->hdiff != NULL) { int i; int len = dview->a[0]->len; for (i = 0; i < len; i++) { GArray *h = (GArray *) g_ptr_array_index (dview->hdiff, i); if (h != NULL) { g_array_free (h, TRUE); } } g_ptr_array_free (dview->hdiff, TRUE); dview->hdiff = NULL; } mc_search_free (dview->search.handle); dview->search.handle = NULL; g_free (dview->search.last_string); dview->search.last_string = NULL; } /* --------------------------------------------------------------------------------------------- */ /* stuff ******************************************************************** */ static int get_digits (unsigned int n) { int d = 1; while (n /= 10) { d++; } return d; } /* --------------------------------------------------------------------------------------------- */ static int get_line_numbers (const GArray * a, size_t pos, int *linenum, int *lineofs) { const DIFFLN *p; *linenum = 0; *lineofs = 0; if (a->len) { if (pos >= a->len) { pos = a->len - 1; } p = &g_array_index (a, DIFFLN, pos); if (!p->line) { int n; for (n = pos; n > 0; n--) { p--; if (p->line) { break; } } *lineofs = pos - n + 1; } *linenum = p->line; } return 0; } /* --------------------------------------------------------------------------------------------- */ static int calc_nwidth (const GArray ** const a) { int l1, o1; int l2, o2; get_line_numbers (a[0], a[0]->len - 1, &l1, &o1); get_line_numbers (a[1], a[1]->len - 1, &l2, &o2); if (l1 < l2) { l1 = l2; } return get_digits (l1); } /* --------------------------------------------------------------------------------------------- */ static int find_prev_hunk (const GArray * a, int pos) { #if 1 while (pos > 0 && ((DIFFLN *) &g_array_index (a, DIFFLN, pos))->ch != EQU_CH) { pos--; } while (pos > 0 && ((DIFFLN *) &g_array_index (a, DIFFLN, pos))->ch == EQU_CH) { pos--; } while (pos > 0 && ((DIFFLN *) &g_array_index (a, DIFFLN, pos))->ch != EQU_CH) { pos--; } if (pos > 0 && (size_t) pos < a->len) pos++; #else while (pos > 0 && ((DIFFLN *) &g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH) { pos--; } while (pos > 0 && ((DIFFLN *) &g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH) { pos--; } #endif return pos; } /* --------------------------------------------------------------------------------------------- */ static size_t find_next_hunk (const GArray * a, size_t pos) { while (pos < a->len && ((DIFFLN *) &g_array_index (a, DIFFLN, pos))->ch != EQU_CH) { pos++; } while (pos < a->len && ((DIFFLN *) &g_array_index (a, DIFFLN, pos))->ch == EQU_CH) { pos++; } return pos; } /** * Find start and end lines of the current hunk. * * \param dview - widget WDiff * \return boolean and * start_line1 first line of current hunk (file[0]) * end_line1 last line of current hunk (file[0]) * start_line1 first line of current hunk (file[0]) * end_line1 last line of current hunk (file[0]) */ static int get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_line2, int *end_line2) { const GArray *a0 = dview->a[0]; const GArray *a1 = dview->a[1]; size_t pos; int ch; int res = 0; *start_line1 = 1; *start_line2 = 1; *end_line1 = 1; *end_line2 = 1; pos = dview->skip_rows; ch = ((DIFFLN *) &g_array_index (a0, DIFFLN, pos))->ch; if (ch != EQU_CH) { switch (ch) { case ADD_CH: res = DIFF_DEL; break; case DEL_CH: res = DIFF_ADD; break; case CHG_CH: res = DIFF_CHG; break; } while (pos > 0 && ((DIFFLN *) &g_array_index (a0, DIFFLN, pos))->ch != EQU_CH) { pos--; } if (pos > 0) { *start_line1 = ((DIFFLN *) &g_array_index (a0, DIFFLN, pos))->line + 1; *start_line2 = ((DIFFLN *) &g_array_index (a1, DIFFLN, pos))->line + 1; } pos = dview->skip_rows; while (pos < a0->len && ((DIFFLN *) &g_array_index (a0, DIFFLN, pos))->ch != EQU_CH) { int l0, l1; l0 = ((DIFFLN *) &g_array_index (a0, DIFFLN, pos))->line; l1 = ((DIFFLN *) &g_array_index (a1, DIFFLN, pos))->line; if (l0 > 0) *end_line1 = max (*start_line1, l0); if (l1 > 0) *end_line2 = max (*start_line2, l1); pos++; } } return res; } static void dview_remove_hunk (WDiff * dview, FILE * merge_file, int from1, int to1) { int line; char buf[BUF_10K]; FILE *f0; f0 = fopen (dview->file[0], "r"); line = 0; while (fgets (buf, sizeof (buf), f0) && line < from1 - 1) { line++; fputs (buf, merge_file); } while (fgets (buf, sizeof (buf), f0)) { line++; if (line >= to1) fputs (buf, merge_file); } fclose (f0); } static void dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2) { int line; char buf[BUF_10K]; FILE *f0; FILE *f1; f0 = fopen (dview->file[0], "r"); f1 = fopen (dview->file[1], "r"); line = 0; while (fgets (buf, sizeof (buf), f0) && line < from1 - 1) { line++; fputs (buf, merge_file); } line = 0; while (fgets (buf, sizeof (buf), f1) && line <= to2) { line++; if (line >= from2) fputs (buf, merge_file); } while (fgets (buf, sizeof (buf), f0)) { fputs (buf, merge_file); } fclose (f0); fclose (f1); } static void dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2) { int line1, line2; char buf[BUF_10K]; FILE *f0; FILE *f1; f0 = fopen (dview->file[0], "r"); f1 = fopen (dview->file[1], "r"); line1 = 0; while (fgets (buf, sizeof (buf), f0) && line1 < from1 - 1) { line1++; fputs (buf, merge_file); } line2 = 0; while (fgets (buf, sizeof (buf), f1) && line2 <= to2) { line2++; if (line2 >= from2) fputs (buf, merge_file); } while (fgets (buf, sizeof (buf), f0)) { line1++; if (line1 > to1) fputs (buf, merge_file); } fclose (f0); fclose (f1); } static void do_merge_hunk (WDiff * dview) { int from1, to1, from2, to2; int res; int hunk; hunk = get_current_hunk (dview, &from1, &to1, &from2, &to2); if (hunk > 0) { int merge_file_fd; FILE *merge_file; char *merge_file_name = NULL; if (!dview->merged) { dview->merged = mc_util_make_backup_if_possible (dview->file[0], "~~~"); if (!dview->merged) { message (D_ERROR, MSG_ERROR, _(" Cannot create backup file \n %s%s \n %s "), dview->file[0], "~~~", unix_error_string (errno)); return; } } merge_file_fd = mc_mkstemps (&merge_file_name, "mcmerge", NULL); if (merge_file_fd == -1) { message (D_ERROR, MSG_ERROR, _(" Cannot create temporary merge file \n %s "), unix_error_string (errno)); return; } merge_file = fdopen (merge_file_fd, "w"); switch (hunk) { case DIFF_DEL: dview_remove_hunk (dview, merge_file, from1, to1); break; case DIFF_ADD: dview_add_hunk (dview, merge_file, from1, from2, to2); break; case DIFF_CHG: dview_replace_hunk (dview, merge_file, from1, to1, from2, to2); break; } fflush (merge_file); fclose (merge_file); res = rewrite_backup_content (merge_file_name, dview->file[0]); unlink (merge_file_name); g_free (merge_file_name); } } /* --------------------------------------------------------------------------------------------- */ /* view routines and callbacks ********************************************** */ static void dview_compute_split (WDiff * dview, int i) { dview->bias += i; if (dview->bias < 2 - dview->half1) { dview->bias = 2 - dview->half1; } if (dview->bias > dview->half2 - 2) { dview->bias = dview->half2 - 2; } } /* --------------------------------------------------------------------------------------------- */ static void dview_compute_areas (WDiff * dview) { dview->height = LINES - 2; dview->half1 = COLS / 2; dview->half2 = COLS - dview->half1; dview_compute_split (dview, 0); } /* --------------------------------------------------------------------------------------------- */ static int dview_init (WDiff * dview, const char *args, const char *file1, const char *file2, const char *label1, const char *label2, DSRC dsrc) { int ndiff; FBUF *f[2]; f[0] = NULL; f[1] = NULL; if (dsrc == DATA_SRC_TMP) { f[0] = f_temp (); if (f[0] == NULL) return -1; f[1] = f_temp (); if (f[1] == NULL) { f_close (f[0]); return -1; } } else if (dsrc == DATA_SRC_ORG) { f[0] = f_open (file1, O_RDONLY); if (f[0] == NULL) return -1; f[1] = f_open (file2, O_RDONLY); if (f[1] == NULL) { f_close (f[0]); return -1; } } dview->args = args; dview->file[0] = file1; dview->file[1] = file2; dview->label[0] = label1; dview->label[1] = label2; dview->f[0] = f[0]; dview->f[1] = f[1]; dview->hdiff = NULL; dview->dsrc = dsrc; dview->converter = str_cnv_from_term; dview_set_codeset (dview); dview->a[0] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); dview->a[1] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); ndiff = redo_diff (dview); if (ndiff < 0) { /* goto WIDGET_DESTROY stage: dview_fini() */ return -1; } dview->ndiff = ndiff; dview->view_quit = 0; dview->bias = 0; dview->new_frame = 1; dview->skip_rows = 0; dview->skip_cols = 0; dview->display_symbols = 0; dview->display_numbers = 0; dview->show_cr = 1; dview->tab_size = 8; dview->ord = 0; dview->full = 0; dview->search.handle=NULL; dview->search.last_string=NULL; dview->search.last_found_line = -1; dview->search.last_accessed_num_line = 0; dview->opt.quality = 0; dview->opt.strip_trailing_cr = 0; dview->opt.ignore_tab_expansion = 0; dview->opt.ignore_space_change = 0; dview->opt.ignore_all_space = 0; dview->opt.ignore_case = 0; dview_compute_areas (dview); return 0; } /* --------------------------------------------------------------------------------------------- */ static void dview_reread (WDiff * dview) { int ndiff = dview->ndiff; destroy_hdiff (dview); g_array_foreach (dview->a[0], DIFFLN, cc_free_elt); g_array_free (dview->a[0], TRUE); g_array_foreach (dview->a[1], DIFFLN, cc_free_elt); g_array_free (dview->a[1], TRUE); dview->a[0] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); dview->a[1] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); ndiff = redo_diff (dview); if (ndiff >= 0) { dview->ndiff = ndiff; } } /* --------------------------------------------------------------------------------------------- */ static void dview_diff_options (WDiff * dview) { const char *quality_str[] = { N_("&Normal"), N_("&Fastest (Assume large files)"), N_("&Minimal (Find a smaller set of change)") }; QuickWidget diffopt_widgets[] = { QUICK_BUTTON (6, 10, 14, OPTY, N_("&Cancel"), B_CANCEL, NULL), QUICK_BUTTON (2, 10, 14, OPTY, N_("&OK"), B_ENTER, NULL), QUICK_CHECKBOX (3, OPTX, 12, OPTY, N_("Strip &trailing carriage return"), &dview->opt.strip_trailing_cr), QUICK_CHECKBOX (3, OPTX, 11, OPTY, N_("Ignore all &whitespace"), &dview->opt.ignore_all_space), QUICK_CHECKBOX (3, OPTX, 10, OPTY, N_("Ignore &space change"), &dview->opt.ignore_space_change), QUICK_CHECKBOX (3, OPTX, 9, OPTY, N_("Ignore tab &expansion"), &dview->opt.ignore_tab_expansion), QUICK_CHECKBOX (3, OPTX, 8, OPTY, N_("&Ignore case"), &dview->opt.ignore_case), QUICK_LABEL (3, OPTX, 7, OPTY, N_("Diff extra options")), QUICK_RADIO (3, OPTX, 3, OPTY, 3, (const char **) quality_str, (int *) &dview->opt.quality), QUICK_LABEL (3, OPTX, 2, OPTY, N_("Diff algorithm")), QUICK_END }; QuickDialog diffopt = { OPTX, OPTY, -1, -1, N_("Diff Options"), "[Diff Options]", diffopt_widgets, 0 }; if (quick_dialog (&diffopt) != B_CANCEL) { dview_reread (dview); } } /* --------------------------------------------------------------------------------------------- */ static void dview_fini (WDiff * dview) { if (dview->dsrc != DATA_SRC_MEM) { f_close (dview->f[1]); f_close (dview->f[0]); } if (dview->converter != str_cnv_from_term) str_close_conv (dview->converter); destroy_hdiff (dview); g_array_foreach (dview->a[0], DIFFLN, cc_free_elt); g_array_free (dview->a[0], TRUE); g_array_foreach (dview->a[1], DIFFLN, cc_free_elt); g_array_free (dview->a[1], TRUE); dview->a[1] = NULL; dview->a[0] = NULL; } /* --------------------------------------------------------------------------------------------- */ static int dview_display_file (const WDiff * dview, int ord, int r, int c, int height, int width) { size_t i, k; int j; char buf[BUFSIZ]; FBUF *f = dview->f[ord]; int skip = dview->skip_cols; int display_symbols = dview->display_symbols; int display_numbers = dview->display_numbers; int show_cr = dview->show_cr; int tab_size = dview->tab_size; const DIFFLN *p; int nwidth = display_numbers; int xwidth = display_symbols + display_numbers; if (xwidth) { if (xwidth > width && display_symbols) { xwidth--; display_symbols = 0; } if (xwidth > width && display_numbers) { xwidth = width; display_numbers = width; } xwidth++; c += xwidth; width -= xwidth; if (width < 0) { width = 0; } } if ((int) sizeof (buf) <= width || (int) sizeof (buf) <= nwidth) { /* abnormal, but avoid buffer overflow */ return -1; } for (i = dview->skip_rows, j = 0; i < dview->a[ord]->len && j < height; j++, i++) { int ch, next_ch, col; size_t cnt; p = (DIFFLN *) &g_array_index (dview->a[ord], DIFFLN, i); ch = p->ch; tty_setcolor (NORMAL_COLOR); if (display_symbols) { tty_gotoyx (r + j, c - 2); tty_print_char (ch); } if (p->line) { if (display_numbers) { tty_gotoyx (r + j, c - xwidth); g_snprintf (buf, display_numbers + 1, "%*d", nwidth, p->line); tty_print_string (str_fit_to_term (buf, nwidth, J_LEFT_FIT)); } if (ch == ADD_CH) { tty_setcolor (DFF_ADD_COLOR); } if (ch == CHG_CH) { tty_setcolor (DFF_CHG_COLOR); } if (f == NULL) { if (i == (size_t) dview->search.last_found_line) { tty_setcolor (MARKED_SELECTED_COLOR); } else { if (dview->hdiff != NULL && g_ptr_array_index (dview->hdiff, i) != NULL) { char att[BUFSIZ]; if (dview->utf8) k = dview_str_utf8_offset_to_pos (p->p, width); else k = width; cvt_mgeta (p->p, p->u.len, buf, k, skip, tab_size, show_cr, g_ptr_array_index (dview->hdiff, i), ord, att); tty_gotoyx (r + j, c); col = 0; for (cnt = 0; cnt < strlen (buf) && col < width; cnt++) { int w; gboolean ch_res; if (dview->utf8) { next_ch = dview_get_utf (buf + cnt, &w, &ch_res); if (w > 1) cnt += w - 1; if (!g_unichar_isprint (next_ch)) next_ch = '.'; } else next_ch = dview_get_byte (buf + cnt, &ch_res); if (ch_res) { tty_setcolor (att[cnt] ? DFF_CHH_COLOR : DFF_CHG_COLOR); #ifdef HAVE_CHARSET if (utf8_display) { if (!dview->utf8) { next_ch = convert_from_8bit_to_utf_c ((unsigned char) next_ch, dview->converter); } } else if (dview->utf8) next_ch = convert_from_utf_to_current_c (next_ch, dview->converter); else #endif next_ch = convert_to_display_c (next_ch); tty_print_anychar (next_ch); col++; } } continue; } else if (ch == CHG_CH) { tty_setcolor (DFF_CHH_COLOR); } } if (dview->utf8) k = dview_str_utf8_offset_to_pos (p->p, width); else k = width; cvt_mget (p->p, p->u.len, buf, k, skip, tab_size, show_cr); } else { cvt_fget (f, p->u.off, buf, width, skip, tab_size, show_cr); } } else { if (display_numbers) { tty_gotoyx (r + j, c - xwidth); memset (buf, ' ', display_numbers); buf[display_numbers] = '\0'; tty_print_string (buf); } if (ch == DEL_CH) { tty_setcolor (DFF_DEL_COLOR); } if (ch == CHG_CH) { tty_setcolor (DFF_CHD_COLOR); } memset (buf, ' ', width); buf[width] = '\0'; } tty_gotoyx (r + j, c); /* tty_print_nstring (buf, width); */ col = 0; for (cnt = 0; cnt < strlen (buf) && col < width; cnt++) { int w; gboolean ch_res; if (dview->utf8) { next_ch = dview_get_utf (buf + cnt, &w, &ch_res); if (w > 1) cnt += w - 1; if (!g_unichar_isprint (next_ch)) next_ch = '.'; } else next_ch = dview_get_byte (buf + cnt, &ch_res); if (ch_res) { #ifdef HAVE_CHARSET if (utf8_display) { if (!dview->utf8) { next_ch = convert_from_8bit_to_utf_c ((unsigned char) next_ch, dview->converter); } } else if (dview->utf8) next_ch = convert_from_utf_to_current_c (next_ch, dview->converter); else #endif next_ch = convert_to_display_c (next_ch); tty_print_anychar (next_ch); col++; } } continue; } tty_setcolor (NORMAL_COLOR); k = width; if (width < xwidth - 1) { k = xwidth - 1; } memset (buf, ' ', k); buf[k] = '\0'; for (; j < height; j++) { if (xwidth) { tty_gotoyx (r + j, c - xwidth); /* tty_print_nstring (buf, xwidth - 1); */ tty_print_string (str_fit_to_term (buf, xwidth - 1, J_LEFT_FIT)); } tty_gotoyx (r + j, c); /* tty_print_nstring (buf, width); */ tty_print_string (str_fit_to_term (buf, width, J_LEFT_FIT)); } return 0; } /* --------------------------------------------------------------------------------------------- */ static void dview_status (const WDiff * dview, int ord, int width, int c) { int skip_rows = dview->skip_rows; int skip_cols = dview->skip_cols; char buf[BUFSIZ]; int filename_width; int linenum, lineofs; tty_setcolor (SELECTED_COLOR); tty_gotoyx (0, c); get_line_numbers (dview->a[ord], skip_rows, &linenum, &lineofs); filename_width = width - 22; if (filename_width < 8) { filename_width = 8; } if (filename_width >= (int) sizeof (buf)) { /* abnormal, but avoid buffer overflow */ filename_width = sizeof (buf) - 1; } trim (strip_home_and_password (dview->label[ord]), buf, filename_width); if (ord == 0) { tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width, buf, linenum, lineofs, skip_cols); } else { tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width, buf, linenum, lineofs, dview->ndiff); } } /* --------------------------------------------------------------------------------------------- */ static void dview_redo (WDiff * dview) { if (dview->display_numbers) { int old = dview->display_numbers; dview->display_numbers = calc_nwidth ((const GArray **) dview->a); dview->new_frame = (old != dview->display_numbers); } dview_reread (dview); } /* --------------------------------------------------------------------------------------------- */ static void dview_edit (WDiff * dview, int ord) { int linenum, lineofs; if (dview->dsrc == DATA_SRC_TMP) { error_dialog (_("Edit"), _(" Edit is disabled ")); return; } get_line_numbers (dview->a[ord], dview->skip_rows, &linenum, &lineofs); do_edit_at_line (dview->file[ord], linenum); dview_redo (dview); dview_update (dview); } /* --------------------------------------------------------------------------------------------- */ static void dview_goto_cmd (WDiff * dview, int ord) { static const char *title[2] = { " Goto line (left) ", " Goto line (right) " }; static char prev[256]; /* XXX some statics here, to be remembered between runs */ int newline; char *input; input = input_dialog (_(title[ord]), _(" Enter line: "), MC_HISTORY_YDIFF_GOTO_LINE, prev); if (input != NULL) { const char *s = input; if (scan_deci (&s, &newline) == 0 && *s == '\0') { size_t i = 0; if (newline > 0) { const DIFFLN *p; for (; i < dview->a[ord]->len; i++) { p = &g_array_index (dview->a[ord], DIFFLN, i); if (p->line == newline) { break; } } } dview->skip_rows = dview->search.last_accessed_num_line = i; snprintf (prev, sizeof (prev), "%d", newline); } g_free (input); } } /* --------------------------------------------------------------------------------------------- */ static void dview_labels (WDiff * dview) { Dlg_head *h = dview->widget.parent; WButtonBar *b = find_buttonbar (h); buttonbar_set_label (b, 1, Q_ ("ButtonBar|Help"), diff_map, (Widget *) dview); buttonbar_set_label (b, 2, Q_ ("ButtonBar|Save"), diff_map, (Widget *) dview); buttonbar_set_label (b, 4, Q_ ("ButtonBar|Edit"), diff_map, (Widget *) dview); buttonbar_set_label (b, 5, Q_ ("ButtonBar|Merge"), diff_map, (Widget *) dview); buttonbar_set_label (b, 7, Q_ ("ButtonBar|Search"), diff_map, (Widget *) dview); buttonbar_set_label (b, 9, Q_ ("ButtonBar|Options"), diff_map, (Widget *) dview); buttonbar_set_label (b, 10, Q_ ("ButtonBar|Quit"), diff_map, (Widget *) dview); } /* --------------------------------------------------------------------------------------------- */ static int dview_event (Gpm_Event * event, void *x) { WDiff *dview = (WDiff *) x; int result = MOU_NORMAL; /* We are not interested in the release events */ if (!(event->type & (GPM_DOWN | GPM_DRAG))) { return result; } /* Wheel events */ if ((event->buttons & GPM_B_UP) && (event->type & GPM_DOWN)) { dview->skip_rows -= 2; dview->search.last_accessed_num_line = dview->skip_rows; dview_update (dview); return result; } if ((event->buttons & GPM_B_DOWN) && (event->type & GPM_DOWN)) { dview->skip_rows += 2; dview->search.last_accessed_num_line = dview->skip_rows; dview_update (dview); return result; } return result; } static gboolean dview_save (WDiff * dview) { gboolean res = TRUE; if (!dview->merged) return res; res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~"); dview->merged = !res; return res; } static void dview_do_save (WDiff * dview) { (void) dview_save (dview); } static void dview_save_options (WDiff * dview) { mc_config_set_bool (mc_main_config, "DiffView", "show_symbols", dview->display_symbols != 0 ? TRUE : FALSE); mc_config_set_bool (mc_main_config, "DiffView", "show_numbers", dview->display_numbers != 0 ? TRUE : FALSE); mc_config_set_int (mc_main_config, "DiffView", "tab_size", dview->tab_size); mc_config_set_int (mc_main_config, "DiffView", "diff_quality", dview->opt.quality); mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_tws", dview->opt.strip_trailing_cr); mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_all_space", dview->opt.ignore_all_space); mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_space_change", dview->opt.ignore_space_change); mc_config_set_bool (mc_main_config, "DiffView", "diff_tab_expansion", dview->opt.ignore_tab_expansion); mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_case", dview->opt.ignore_case); } static void dview_load_options (WDiff * dview) { gboolean show_numbers, show_symbols; show_symbols = mc_config_get_bool (mc_main_config, "DiffView", "show_symbols", FALSE); if (show_symbols) dview->display_symbols = 1; show_numbers = mc_config_get_bool (mc_main_config, "DiffView", "show_numbers", FALSE); if (show_numbers) dview->display_numbers = calc_nwidth ((const GArray ** const) dview->a); dview->tab_size = mc_config_get_int (mc_main_config, "DiffView", "tab_size", 8); dview->opt.quality = mc_config_get_int (mc_main_config, "DiffView", "diff_quality", 0); dview->opt.strip_trailing_cr = mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_tws", FALSE); dview->opt.ignore_all_space = mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_all_space", FALSE); dview->opt.ignore_space_change = mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_space_change", FALSE); dview->opt.ignore_tab_expansion = mc_config_get_bool (mc_main_config, "DiffView", "diff_tab_expansion", FALSE); dview->opt.ignore_case = mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_case", FALSE); dview->new_frame = 1; } /* * Check if it's OK to close the diff viewer. If there are unsaved changes, * ask user. */ static gboolean dview_ok_to_exit (WDiff * dview) { gboolean res = TRUE; if (!dview->merged) return res; switch (query_dialog (_("Quit"), _(" File was modified, Save with exit? "), D_NORMAL, 2, _("&Yes"), _("&No"))) { case -1: res = FALSE; break; case 0: res = TRUE; (void) dview_save (dview); break; case 1: res = TRUE; if (mc_util_restore_from_backup_if_possible (dview->file[0], "~~~")) res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~"); break; } return res; } /* --------------------------------------------------------------------------------------------- */ static cb_ret_t dview_execute_cmd (WDiff * dview, unsigned long command) { cb_ret_t res = MSG_HANDLED; switch (command) { case CK_DiffHelp: interactive_display (NULL, "[Diff Viewer]"); break; case CK_DiffDisplaySymbols: dview->display_symbols ^= 1; dview->new_frame = 1; break; case CK_DiffDisplayNumbers: dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a); dview->new_frame = 1; break; case CK_DiffFull: dview->full ^= 1; dview->new_frame = 1; break; case CK_DiffEqual: if (!dview->full) { dview->bias = 0; dview->new_frame = 1; } break; case CK_DiffSplitMore: if (!dview->full) { dview_compute_split (dview, 1); dview->new_frame = 1; } break; case CK_DiffSplitLess: if (!dview->full) { dview_compute_split (dview, -1); dview->new_frame = 1; } break; case CK_DiffSetTab2: dview->tab_size = 2; break; case CK_DiffSetTab3: dview->tab_size = 3; break; case CK_DiffSetTab4: dview->tab_size = 4; break; case CK_DiffSetTab8: dview->tab_size = 8; break; case CK_DiffSwapPanel: dview->ord ^= 1; break; case CK_DiffRedo: dview_redo (dview); break; case CK_DiffNextHunk: dview->skip_rows = dview->search.last_accessed_num_line = find_next_hunk (dview->a[0], dview->skip_rows); break; case CK_DiffPrevHunk: dview->skip_rows = dview->search.last_accessed_num_line = find_prev_hunk (dview->a[0], dview->skip_rows); break; case CK_DiffGoto: dview_goto_cmd (dview, TRUE); break; case CK_DiffEditCurrent: dview_edit (dview, dview->ord); break; case CK_DiffMergeCurrentHunk: do_merge_hunk (dview); dview_redo (dview); break; case CK_DiffEditOther: dview_edit (dview, dview->ord ^ 1); break; case CK_DiffSearch: dview_search_cmd (dview); break; case CK_DiffContinueSearch: dview_continue_search_cmd (dview); break; case CK_DiffBOF: dview->skip_rows = dview->search.last_accessed_num_line = 0; break; case CK_DiffEOF: dview->skip_rows = dview->search.last_accessed_num_line = dview->a[0]->len - 1; break; case CK_DiffUp: dview->skip_rows--; dview->search.last_accessed_num_line = dview->skip_rows; break; case CK_DiffDown: dview->skip_rows++; dview->search.last_accessed_num_line = dview->skip_rows; break; case CK_DiffPageDown: dview->skip_rows += dview->height - 2; dview->search.last_accessed_num_line = dview->skip_rows; break; case CK_DiffPageUp: dview->skip_rows -= dview->height - 2; dview->search.last_accessed_num_line = dview->skip_rows; break; case CK_DiffLeft: dview->skip_cols--; break; case CK_DiffRight: dview->skip_cols++; break; case CK_DiffQuickLeft: dview->skip_cols -= 8; break; case CK_DiffQuickRight: dview->skip_cols += 8; break; case CK_DiffHome: dview->skip_cols = 0; break; case CK_ShowCommandLine: view_other_cmd (); break; case CK_DiffQuit: dview->view_quit = 1; break; case CK_DiffSave: dview_do_save (dview); break; case CK_DiffOptions: dview_diff_options (dview); break; case CK_SelectCodepage: dview_select_encoding (dview); dview_reread (dview); tty_touch_screen (); repaint_screen (); break; default: res = MSG_NOT_HANDLED; } return res; } /* --------------------------------------------------------------------------------------------- */ static cb_ret_t dview_handle_key (WDiff * dview, int key) { unsigned long command; key = convert_from_input_c (key); command = lookup_keymap_command (diff_map, key); if ((command != CK_Ignore_Key) && (dview_execute_cmd (dview, command) == MSG_HANDLED)) return MSG_HANDLED; /* Key not used */ return MSG_NOT_HANDLED; } /* --------------------------------------------------------------------------------------------- */ static cb_ret_t dview_callback (Widget * w, widget_msg_t msg, int parm) { WDiff *dview = (WDiff *) w; Dlg_head *h = dview->widget.parent; cb_ret_t i; switch (msg) { case WIDGET_INIT: dview_labels (dview); dview_load_options (dview); dview_update (dview); return MSG_HANDLED; case WIDGET_DRAW: dview->new_frame = 1; dview_update (dview); return MSG_HANDLED; case WIDGET_KEY: i = dview_handle_key (dview, parm); if (dview->view_quit) dlg_stop (h); else dview_update (dview); return i; case WIDGET_COMMAND: i = dview_execute_cmd (dview, parm); if (dview->view_quit) dlg_stop (h); else dview_update (dview); return i; case WIDGET_DESTROY: dview_save_options (dview); dview_fini (dview); return MSG_HANDLED; default: return default_proc (msg, parm); } } /* --------------------------------------------------------------------------------------------- */ static void dview_adjust_size (Dlg_head * h) { WDiff *dview; WButtonBar *bar; /* Look up the viewer and the buttonbar, we assume only two widgets here */ dview = (WDiff *) find_widget_type (h, dview_callback); bar = find_buttonbar (h); widget_set_size (&dview->widget, 0, 0, LINES - 1, COLS); widget_set_size ((Widget *) bar, LINES - 1, 0, 1, COLS); dview_compute_areas (dview); } /* --------------------------------------------------------------------------------------------- */ static cb_ret_t dview_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data) { WDiff *dview = (WDiff *) data; switch (msg) { case DLG_RESIZE: dview_adjust_size (h); return MSG_HANDLED; case DLG_ACTION: /* command from buttonbar */ return send_message ((Widget *) dview, WIDGET_COMMAND, parm); case DLG_VALIDATE: dview = (WDiff *) find_widget_type (h, dview_callback); if (!dview_ok_to_exit (dview)) h->running = 1; return MSG_HANDLED; default: return default_dlg_callback (h, sender, msg, parm, data); } } /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ int diff_view (const char *file1, const char *file2, const char *label1, const char *label2) { int error; WDiff *dview; WButtonBar *bar; Dlg_head *dview_dlg; /* Create dialog and widgets, put them on the dialog */ dview_dlg = create_dlg (0, 0, LINES, COLS, NULL, dview_dialog_callback, "[Diff Viewer]", NULL, DLG_WANT_TAB); dview = g_new0 (WDiff, 1); init_widget (&dview->widget, 0, 0, LINES - 1, COLS, (callback_fn) dview_callback, (mouse_h) dview_event); widget_want_cursor (dview->widget, 0); bar = buttonbar_new (1); add_widget (dview_dlg, dview); add_widget (dview_dlg, bar); error = dview_init (dview, "-a", file1, file2, label1, label2, DATA_SRC_MEM); /* XXX binary diff? */ /* Please note that if you add another widget, * you have to modify dview_adjust_size to * be aware of it */ if (error == 0) run_dlg (dview_dlg); destroy_dlg (dview_dlg); return error; } /* --------------------------------------------------------------------------------------------- */ #define GET_FILE_AND_STAMP(n) \ do { \ use_copy##n = 0; \ real_file##n = file##n; \ if (!vfs_file_is_local(file##n)) { \ real_file##n = mc_getlocalcopy(file##n); \ if (real_file##n != NULL) { \ use_copy##n = 1; \ if (mc_stat(real_file##n, &st##n) != 0) { \ use_copy##n = -1; \ } \ } \ } \ } while (0) #define UNGET_FILE(n) \ do { \ if (use_copy##n) { \ int changed = 0; \ if (use_copy##n > 0) { \ time_t mtime = st##n.st_mtime; \ if (mc_stat(real_file##n, &st##n) == 0) { \ changed = (mtime != st##n.st_mtime); \ } \ } \ mc_ungetlocalcopy(file##n, real_file##n, changed); \ g_free(real_file##n); \ } \ } while (0) void dview_diff_cmd (void) { int rv = 0; char *file0 = NULL; char *file1 = NULL; int is_dir0 = 0; int is_dir1 = 0; if (mc_run_mode == MC_RUN_FULL) { const WPanel *panel0 = current_panel; const WPanel *panel1 = other_panel; if (get_current_index ()) { panel0 = other_panel; panel1 = current_panel; } file0 = concat_dir_and_file (panel0->cwd, selection (panel0)->fname); file1 = concat_dir_and_file (panel1->cwd, selection (panel1)->fname); is_dir0 = S_ISDIR (selection (panel0)->st.st_mode); is_dir1 = S_ISDIR (selection (panel1)->st.st_mode); } if (rv == 0) { rv = -1; if (file0 != NULL && !is_dir0 && file1 != NULL && !is_dir1) { int use_copy0; int use_copy1; struct stat st0; struct stat st1; char *real_file0; char *real_file1; GET_FILE_AND_STAMP (0); GET_FILE_AND_STAMP (1); if (real_file0 != NULL && real_file1 != NULL) { rv = diff_view (real_file0, real_file1, file0, file1); } UNGET_FILE (1); UNGET_FILE (0); } } g_free (file1); g_free (file0); if (rv != 0) message (1, MSG_ERROR, _("Two files are needed to compare")); } /* --------------------------------------------------------------------------------------------- */ void dview_update (WDiff * dview) { int height = dview->height; int width1; int width2; int last = dview->a[0]->len - 1; if (dview->skip_rows > last) { dview->skip_rows = dview->search.last_accessed_num_line = last; } if (dview->skip_rows < 0) { dview->skip_rows = dview->search.last_accessed_num_line = 0; } if (dview->skip_cols < 0) { dview->skip_cols = 0; } if (height < 2) { return; } width1 = dview->half1 + dview->bias; width2 = dview->half2 - dview->bias; if (dview->full) { width1 = COLS; width2 = 0; } if (dview->new_frame) { int xwidth = dview->display_symbols + dview->display_numbers; tty_setcolor (NORMAL_COLOR); if (width1 > 1) { tty_draw_box (1, 0, height, width1, FALSE); } if (width2 > 1) { tty_draw_box (1, width1, height, width2, FALSE); } if (xwidth) { xwidth++; if (xwidth < width1 - 1) { tty_gotoyx (1, xwidth); tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE], FALSE); tty_gotoyx (height, xwidth); tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE], FALSE); tty_draw_vline (2, xwidth, mc_tty_frm[MC_TTY_FRM_VERT], height - 2); } if (xwidth < width2 - 1) { tty_gotoyx (1, width1 + xwidth); tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE], FALSE); tty_gotoyx (height, width1 + xwidth); tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE], FALSE); tty_draw_vline (2, width1 + xwidth, mc_tty_frm[MC_TTY_FRM_VERT], height - 2); } } dview->new_frame = 0; } if (width1 > 2) { dview_status (dview, dview->ord, width1, 0); dview_display_file (dview, dview->ord, 2, 1, height - 2, width1 - 2); } if (width2 > 2) { dview_status (dview, dview->ord ^ 1, width2, width1); dview_display_file (dview, dview->ord ^ 1, 2, width1 + 1, height - 2, width2 - 2); } } /* --------------------------------------------------------------------------------------------- */