Mercurial > hg > xemacs-beta
comparison src/termcap.c @ 4990:8f0cf4fd3d2c
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 06 Feb 2010 04:01:46 -0600 |
| parents | 16112448d484 |
| children | dd2976af8783 |
comparison
equal
deleted
inserted
replaced
| 4989:d2ec55325515 | 4990:8f0cf4fd3d2c |
|---|---|
| 409 if (scan_file (term, fd, &buf) == 0) | 409 if (scan_file (term, fd, &buf) == 0) |
| 410 return 0; | 410 return 0; |
| 411 | 411 |
| 412 /* Free old `term' if appropriate. */ | 412 /* Free old `term' if appropriate. */ |
| 413 if (term != name) | 413 if (term != name) |
| 414 xfree (term, const char *); | 414 xfree (term); |
| 415 | 415 |
| 416 /* If BP is malloc'd by us, make sure it is big enough. */ | 416 /* If BP is malloc'd by us, make sure it is big enough. */ |
| 417 if (malloc_size) | 417 if (malloc_size) |
| 418 { | 418 { |
| 419 malloc_size = bp1 - bp + buf.size; | 419 malloc_size = bp1 - bp + buf.size; |
| 439 If something is found, copy it into heap and null-terminate it. */ | 439 If something is found, copy it into heap and null-terminate it. */ |
| 440 term = tgetst1 (find_capability (bp2, "tc"), 0); | 440 term = tgetst1 (find_capability (bp2, "tc"), 0); |
| 441 } | 441 } |
| 442 | 442 |
| 443 retry_close (fd); | 443 retry_close (fd); |
| 444 xfree (buf.beg, char *); | 444 xfree (buf.beg); |
| 445 | 445 |
| 446 if (malloc_size) | 446 if (malloc_size) |
| 447 { | 447 { |
| 448 bp = (char *) xrealloc (bp, bp1 - bp + 1); | 448 bp = (char *) xrealloc (bp, bp1 - bp + 1); |
| 449 } | 449 } |
| 649 for (y = x; *y; y++) | 649 for (y = x; *y; y++) |
| 650 if (*y <= ' ' || *y == 0177) | 650 if (*y <= ' ' || *y == 0177) |
| 651 printf ("\\%0o", *y); | 651 printf ("\\%0o", *y); |
| 652 else | 652 else |
| 653 putchar (*y); | 653 putchar (*y); |
| 654 xfree (x, char *); | 654 xfree (x); |
| 655 } | 655 } |
| 656 else | 656 else |
| 657 printf ("none"); | 657 printf ("none"); |
| 658 putchar ('\n'); | 658 putchar ('\n'); |
| 659 } | 659 } |
