src/usr.bin/patch/pch.c - diff

Return to pch.c CVS log

Up to [local] / src / usr.bin / patch

Diff for /src/usr.bin/patch/pch.c between version 1.6 and 1.7

version 1.6, 1996/09/23 10:54:22

version 1.7, 1996/09/24 04:19:29

Line 781

fillsrc = 1;

filldst = fillsrc + p_ptrn_lines;

p_end = filldst + p_repl_lines;

Sprintf(buf,"*** %ld,%ld ****\n",p_first,p_first + p_ptrn_lines - 1);

Snprintf(buf, sizeof buf, "*** %ld,%ld ****\n", p_first,

p_first + p_ptrn_lines - 1);

p_line[0] = savestr(buf);

if (out_of_mem) {

p_end = -1;

return FALSE;

}

p_char[0] = '*';

Sprintf(buf,"--- %ld,%ld ----\n",p_newfirst,p_newfirst+p_repl_lines-1);

Snprintf(buf, sizeof buf, "--- %ld,%ld ----\n", p_newfirst,

p_newfirst + p_repl_lines - 1);

p_line[filldst] = savestr(buf);

if (out_of_mem) {

p_end = 0;

Line 920

Line 922

grow_hunkmax();

p_newfirst = min;

p_repl_lines = max - min + 1;

Sprintf(buf, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1);

Snprintf(buf, sizeof buf, "*** %ld,%ld\n", p_first,

p_first + p_ptrn_lines - 1);

p_line[0] = savestr(buf);

if (out_of_mem) {

p_end = -1;

Line 952

Line 955

if (*buf != '-')

fatal2("--- expected at line %ld of patch\n", p_input_line);

}

Sprintf(buf, "--- %ld,%ld\n", min, max);

Snprintf(buf, sizeof(buf), "--- %ld,%ld\n", min, max);

p_line[i] = savestr(buf);

if (out_of_mem) {

p_end = i-1;

Line 1227

Line 1230

Unlink(TMPOUTNAME);

copy_file(filearg[0], TMPOUTNAME);

if (verbose)

Sprintf(buf, "/bin/ed %s", TMPOUTNAME);

Snprintf(buf, sizeof buf, "/bin/ed %s", TMPOUTNAME);

else

Sprintf(buf, "/bin/ed - %s", TMPOUTNAME);

Snprintf(buf, sizeof buf, "/bin/ed - %s", TMPOUTNAME);

pipefp = popen(buf, "w");

}

for (;;) {