diff: allow case of no more src but only + in diff

Author: lws-team

fixdiff.c

@@ -381,11 +381,11 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 
 		while (!hit) {
 			ls = fixdiff_get_line(&lb, in_src, sizeof(in_src));
-			if (!ls) {
-				elog("failed to match, best chunk %d lines at %s:%d\n", lmc, pdp->pf, lg_lis);
-				mc = 0;
-				break;
-			}
+				/*
+				 * We may be adding at end with original lines leading-in, in this
+				 * case it is normal we will not be able to fetch any more lines
+				 * from the original file before running out of diff
+				 */
 
 			do {
 				lt = fixdiff_get_line(&lb_temp, in_temp, sizeof(in_temp));
@@ -399,6 +399,13 @@ fixdiff_find_original(dp_t *pdp, int *line_start)
 			if (hit)
 				break;
 
+			if (!ls) {
+				elog("failed to match, best chunk %d lines at %s:%d\n",
+				     lmc, pdp->pf, lg_lis);
+				mc = 0;
+				break;
+			}
+
 			if (fixdiff_strcmp(in_temp + 1, lt - 1, &let, in_src, ls, &les)) {
 				if (mc > pdp->pre + pdp->post)
 					elog("match failed after %d: '%s' / '%s'", mc, in_temp + 1, in_src);

tools/concat.sh

@@ -27,7 +27,11 @@ if [ $? -ne 0 ] ; then
 	exit 0
 fi
 cat .concat.tmp | xsel
-
+if [ $? -ne 0 ] ; then
+	echo "xsel not available, dumping to stdout =============================================="
+	cat .concat.tmp
+	exit 0
+fi
 echo "Concatenated file contents in clipboard"
 
 exit 0