Changeset 2619
- Timestamp:
- Mar 12, 2006, 6:02:46 PM (19 years ago)
- Location:
- trunk/texinfo
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/texinfo/info/echo-area.c
r2617 r2619 592 592 593 593 counter = input_line_end - input_line_point; 594 594 595 595 for (i = input_line_point - len; counter; i++, counter--) 596 596 input_line[i] = input_line[i + len]; … … 894 894 return (line); 895 895 } 896 896 897 897 /* Read a line in the echo area with completion over COMPLETIONS. */ 898 898 char * … … 1488 1488 pause_or_input (void) 1489 1489 { 1490 #if def FD_SET1490 #if defined(FD_SET) && !defined(__INNOTEK_LIBC__) 1491 1491 struct timeval timer; 1492 1492 fd_set readfds; -
trunk/texinfo/info/filesys.h
r2617 r2619 79 79 /* The default value of INFOPATH. */ 80 80 #if !defined (DEFAULT_INFOPATH) 81 # define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:." 81 # ifndef __EMX__ 82 # define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:." 83 # else 84 # define DEFAULT_INFOPATH ".;/usr/local/info;/usr/info;/usr/local/lib/info;/usr/lib/info;/usr/local/gnu/info;/usr/local/gnu/lib/info;/usr/gnu/info;/usr/gnu/lib/info;/opt/gnu/info;/usr/share/info;/usr/share/lib/info;/usr/local/share/info;/usr/local/share/lib/info;/usr/gnu/lib/emacs/info;/usr/local/gnu/lib/emacs/info;/usr/local/lib/emacs/info;/usr/local/emacs/info;/emx/info;" 85 # endif /* __EMX__ */ 82 86 #endif /* !DEFAULT_INFOPATH */ 83 87 -
trunk/texinfo/info/man.c
r2617 r2619 33 33 #include "tilde.h" 34 34 #include "man.h" 35 36 #ifdef __EMX__ 37 # include <process.h> 38 # include <sys/wait.h> 39 # undef PIPE_USE_FORK 40 #endif 35 41 36 42 #if !defined (_POSIX_VERSION) … … 471 477 int bindex = 0; 472 478 int select_result; 473 #if defined (FD_SET) 479 #if defined (FD_SET) && !defined (__INNOTEK__LIBC__) 474 480 fd_set read_fds; 475 481 -
trunk/texinfo/info/session.c
r2617 r2619 24 24 #include "search.h" 25 25 #include <sys/ioctl.h> 26 27 #ifdef __EMX__ 28 # include <stdlib.h> 29 # include "pc.h" 30 #endif /* __EMX__ */ 26 31 27 32 #if defined (HAVE_SYS_TIME_H) … … 1994 1999 prefer the one forward. The return is in newly-allocated memory, 1995 2000 since the caller frees it. 1996 2001 1997 2002 This is called from info_menu_or_ref_item with XREF_LIST being all 1998 2003 the xrefs in the node, and POS being point. The ui function that … … 2009 2014 int nearest = -1; 2010 2015 long best_delta = -1; 2011 2016 2012 2017 for (this_xref = 0; xref_list[this_xref]; this_xref++) 2013 2018 { … … 2019 2024 break; 2020 2025 } 2021 2026 2022 2027 /* See how far POS is from this xref. Take into account the 2023 2028 `*Note' that begins the xref, since as far as the user is … … 2025 2030 delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))), 2026 2031 labs (pos - xref->end)); 2027 2032 2028 2033 /* It's the <= instead of < that makes us choose the forward xref 2029 2034 of POS if two are equidistant. Of course, because of all the … … 2036 2041 } 2037 2042 } 2038 2043 2039 2044 /* Maybe there was no list to search through. */ 2040 2045 if (nearest < 0) 2041 2046 return NULL; 2042 2047 2043 2048 /* Ok, we have a nearest xref, make a list of it. */ 2044 2049 { … … 3299 3304 3300 3305 #if !defined (DEFAULT_INFO_PRINT_COMMAND) 3306 # ifndef __EMX__ 3301 3307 # define DEFAULT_INFO_PRINT_COMMAND "lpr" 3308 # else 3309 # define DEFAULT_INFO_PRINT_COMMAND "expand --tabs=4 >>InfoLog.tmp" 3310 # endif /* __EMX__ */ 3302 3311 #endif /* !DEFAULT_INFO_PRINT_COMMAND */ 3303 3312 … … 4114 4123 break; 4115 4124 } 4116 4125 4117 4126 4118 4127 if (search_result == 0) … … 4575 4584 !info_input_pending_p ()) 4576 4585 { 4577 #if defined (FD_SET) 4586 #if defined (FD_SET) && !defined (__EMX__) 4578 4587 struct timeval timer; 4579 4588 fd_set readfds; … … 4924 4933 space_avail = info_input_buffer_space_available (); 4925 4934 4935 #ifdef __EMX__ 4936 if ( is_xfree86 == XFREE86_NO ) 4937 { 4938 while (chars_avail < space_avail && (tty = pc_getc(0)) != -1) 4939 input[chars_avail++] = tty; 4940 } 4941 else 4942 { 4943 #endif /* __EMX__ */ 4926 4944 /* If we can just find out how many characters there are to read, do so. */ 4927 4945 #if defined (FIONREAD) … … 4976 4994 # endif /* O_NDELAY */ 4977 4995 #endif /* !FIONREAD */ 4996 #ifdef __EMX__ 4997 } 4998 #endif /* __EMX__ */ 4978 4999 4979 5000 while (i < chars_avail) … … 5002 5023 unsigned char c; 5003 5024 int tty = fileno (info_input_stream); 5025 5026 #ifdef __EMX__ 5027 if (is_xfree86 == XFREE86_NO) 5028 keystroke = pc_getc(1); 5029 else 5030 { 5031 #endif /* __EMX__ */ 5004 5032 5005 5033 /* Using stream I/O causes FIONREAD etc to fail to work … … 5046 5074 } 5047 5075 } 5076 #ifdef __EMX__ 5077 } 5078 #endif /* __EMX__ */ 5048 5079 } 5049 5080 -
trunk/texinfo/info/terminal.c
r2617 r2619 24 24 #include "terminal.h" 25 25 #include "termdep.h" 26 #ifdef __EMX__ 27 # include <stdlib.h> 28 # include "pc.h" 29 #endif /* __EMX__ */ 26 30 27 31 #include <sys/types.h> … … 135 139 if (term_keypad_on) 136 140 send_to_terminal (term_keypad_on); 137 141 138 142 if (!term_begin_use || !*term_begin_use) 139 143 return; 140 144 141 145 #ifdef SIGWINCH 142 sigsave = signal (SIGWINCH, SIG_IGN); 146 sigsave = signal (SIGWINCH, SIG_IGN); 143 147 #endif 144 148 … … 166 170 if (term_keypad_off) 167 171 send_to_terminal (term_keypad_off); 168 172 169 173 if (!term_end_use || !*term_end_use) 170 174 return; … … 460 464 screenwidth = screenheight = 0; 461 465 466 #ifdef __EMX__ 467 { 468 int s[2]; 469 _scrsize (s); 470 screenwidth = s[0]; 471 screenheight = s[1]; 472 if (getenv ("WINDOWID")) 473 { 474 FILE *fd = popen ("scrsize","rt"); 475 if (fd) 476 { 477 fscanf (fd, "%i %i", &screenwidth, &screenheight); 478 pclose (fd); 479 } 480 } 481 } 482 #endif /* __EMX__ */ 483 462 484 #if defined (TIOCGWINSZ) 463 485 { … … 705 727 706 728 tty = fileno (stdin); 729 730 #ifdef __EMX__ 731 if (is_xfree86 == XFREE86_NO) 732 pc_init (); 733 else 734 { 735 #endif /* __EMX__ */ 707 736 708 737 #if defined (HAVE_TERMIOS_H) … … 827 856 ioctl (tty, TIOCSETN, &ttybuff); 828 857 #endif /* !HAVE_TERMIOS_H && !HAVE_TERMIO_H */ 858 #ifdef __EMX__ 859 } 860 #endif /* __EMX__ */ 829 861 } 830 862 … … 843 875 844 876 tty = fileno (stdin); 877 878 #ifdef __EMX__ 879 if ( is_xfree86 == XFREE86_NO ) 880 pc_exit (); 881 else 882 { 883 #endif /* __EMX__ */ 845 884 846 885 #if defined (HAVE_TERMIOS_H) … … 868 907 # endif /* !HAVE_TERMIO_H */ 869 908 #endif /* !HAVE_TERMIOS_H */ 909 #ifdef __EMX__ 910 } 911 #endif /* __EMX__ */ 870 912 terminal_end_using_terminal (); 871 913 } -
trunk/texinfo/lib/Makefile.am
r2617 r2619 18 18 gettext.h \ 19 19 strcase.h strdup.h substring.c system.h \ 20 xalloc.h xexit.c xmalloc.c xstrdup.c 20 xalloc.h xexit.c xmalloc.c xstrdup.c \ 21 pc.c pc.h 21 22 libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA) 22 23 libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD) -
trunk/texinfo/lib/system.h
r2617 r2619 28 28 #ifdef MIKTEX 29 29 #include <gnu-miktex.h> 30 #define S_ISDIR(x) ((x)&_S_IFDIR) 30 #define S_ISDIR(x) ((x)&_S_IFDIR) 31 31 #else 32 32 /* MiKTeX defines substring() in a separate DLL, where it has its 33 own __declspec declaration. We don't want to try to duplicate 33 own __declspec declaration. We don't want to try to duplicate 34 34 this Microsoft-ism here. */ 35 35 extern char *substring (const char *, const char *); … … 213 213 # define DEFAULT_INFO_PRINT_COMMAND ">PRN" 214 214 # else /* O_BINARY && !__MSDOS__ */ 215 # define setmode(f,m) _setmode(f,m) 216 # define HAVE_LONG_FILENAMES(dir) (1) 217 # define NULL_DEVICE "NUL" 215 # ifdef __EMX__ 216 # define NULL_DEVICE "nul" 217 # define HAVE_LONG_FILENAMES(dir) (1) 218 # define DEFAULT_INFO_PRINT_COMMAND "expand --tabs=4 >>InfoLog.tmp" 219 # else 220 # define setmode(f,m) _setmode(f,m) 221 # define HAVE_LONG_FILENAMES(dir) (1) 222 # define NULL_DEVICE "NUL" 223 # endif /* !__EMX__ */ 218 224 # endif /* O_BINARY && !__MSDOS__ */ 219 225 # ifdef __CYGWIN__ … … 229 235 # define FOPEN_RBIN "rb" 230 236 # define FOPEN_WBIN "wb" 237 # ifdef __EMX__ /* bird - start */ 238 # define FOPEN_RTXT "rt" 239 # define FOPEN_WTXT "wt" 240 # else 241 # define FOPEN_RTXT "r" 242 # define FOPEN_WTXT "w" 243 # endif /* bird - end */ 231 244 # define HAVE_DRIVE(n) ((n)[0] && (n)[1] == ':') 232 245 # define IS_SLASH(c) ((c) == '/' || (c) == '\\') … … 240 253 # define FOPEN_RBIN "r" 241 254 # define FOPEN_WBIN "w" 255 # define FOPEN_RTXT "r" /* bird */ 256 # define FOPEN_WTXT "w" /* bird */ 242 257 # define IS_SLASH(c) ((c) == '/') 243 258 # define HAVE_DRIVE(n) (0) -
trunk/texinfo/makeinfo/files.c
r2617 r2619 202 202 203 203 fullpath 204 = get_file_info_in_path (filename, use_path ? include_files_path : NULL, 204 = get_file_info_in_path (filename, use_path ? include_files_path : NULL, 205 205 &fileinfo); 206 206 … … 369 369 } 370 370 371 #if defined (__EMX__) 372 /* Convert DOS slashes to UNIX slashes. */ 373 static char *slashify (char *filename) 374 { 375 if (filename) 376 for (char *s = strchr (filename, '/'); s; s = strchr (s + 1, '/') 377 *s = '/'; 378 return filename; 379 } 380 #endif 381 371 382 /* Return just the simple part of the filename; i.e. the 372 383 filename without the path information, or extensions. … … 375 386 filename_part (char *filename) 376 387 { 388 #if defined (__EMX__) 389 char *basename = filename_non_directory (slashify (filename)); 390 #else 377 391 char *basename = filename_non_directory (filename); 392 #endif 378 393 379 394 #ifdef REMOVE_OUTPUT_EXTENSIONS … … 394 409 char *result = NULL; 395 410 int i; 411 #ifdef __EMX__ 412 slashify (filename); 413 #endif 396 414 397 415 filename = expand_filename (filename, ""); … … 414 432 int initial_character; 415 433 char *result; 434 #ifdef __EMX__ 435 slashify (filename); 436 #endif 416 437 417 438 /* No filename given? */ 418 439 if (!filename || !*filename) 419 440 return xstrdup (""); 420 441 421 442 /* Already absolute? */ 422 443 if (IS_ABSOLUTE (filename) || … … 443 464 strcat (localdir, "/"); 444 465 strcat (localdir, filename); 466 #ifdef __EMX__ 467 slashify (localdir); 468 #endif 445 469 result = xstrdup (localdir); 446 470 free (localdir); … … 505 529 { 506 530 int i; 531 #ifdef __EMX__ 532 slashify (filename); 533 slashify (input_name); 534 #endif 507 535 508 536 if (filename) … … 542 570 /* Make it so that relative names work. */ 543 571 char *result; 544 572 545 573 i = strlen (input_name) - 1; 546 574 … … 580 608 char *lastdot, *p; 581 609 582 #if def _PC_NAME_MAX610 #if defined (_PC_NAME_MAX) && !defined(__EMX__) /* bird: _PC_NAME_MAX => 14 on OS/2. FIXME!!! */ 583 611 maxlen = pathconf (fname, _PC_NAME_MAX); 584 612 if (maxlen < 1) … … 657 685 || FILENAME_CMP (current_output_filename, ALSO_NULL_DEVICE) == 0) 658 686 return; 659 687 660 688 /* We need the HTML header in the output, 661 689 to get a proper output_position. */ -
trunk/texinfo/makeinfo/makeinfo.c
r2617 r2619 543 543 int reading_from_stdin = 0; 544 544 545 #ifdef __EMX__ 546 _response (&argc, &argv); 547 _wildcard (&argc, &argv); 548 if (argc == 1 && isatty (STDIN_FILENO)) 549 usage (0); 550 #endif 551 545 552 #ifdef HAVE_SETLOCALE 546 553 /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing … … 658 665 { 659 666 macro_expansion_filename = optarg; 660 macro_expansion_output_stream 661 = strcmp (optarg, "-") == 0 ? stdout : fopen (optarg, "w"); 667 #if defined(__EMX__) 668 if (strcmp (optarg, "-") == 0) 669 { 670 macro_expansion_output_stream = stdout; 671 freopen(NULL, FOPEN_WBIN, stdout); 672 } 673 else 674 macro_expansion_output_stream = fopen (optarg, FOPEN_WBIN); 675 #else 676 macro_expansion_output_stream = 677 strcmp (optarg, "-") == 0 ? stdout : fopen (optarg, "w"); 678 #endif 662 679 if (!macro_expansion_output_stream) 663 680 error (_("%s: could not open macro expansion output `%s'"), … … 999 1016 sprintf (end_block, "\n%cend ", COMMAND_PREFIX); 1000 1017 if (executing_string && strstr (string, end_block)) 1001 line_error (_("Multiline command %c%s used improperly"), 1018 line_error (_("Multiline command %c%s used improperly"), 1002 1019 COMMAND_PREFIX, command); 1003 1020 else … … 1632 1649 real_output_filename = xstrdup (real_output_filename); 1633 1650 1634 output_stream = fopen (real_output_filename, "w"); 1651 #if defined(__EMX__) 1652 output_stream = fopen (real_output_filename, FOPEN_WBIN); 1653 #else 1654 output_stream = fopen (real_output_filename, "w"); 1655 #endif 1635 1656 } 1636 1657 … … 3341 3362 add_word_args ("\"%s\"", fullname); 3342 3363 add_html_elt (" alt="); 3343 add_word_args ("\"%s\">", 3364 add_word_args ("\"%s\">", 3344 3365 escape_string (*alt_arg ? text_expansion (alt_arg) : fullname)); 3345 3366 … … 3378 3399 strcpy (txtname, name_arg); 3379 3400 strcat (txtname, ".txt"); 3380 image_file = fopen (txtname, "r");3401 image_file = fopen (txtname, FOPEN_RTXT); /* bird: text */ 3381 3402 if (image_file == NULL) 3382 3403 { … … 3384 3405 include_files_path, &file_info); 3385 3406 if (txtpath != NULL) 3386 image_file = fopen (txtpath, "r");3407 image_file = fopen (txtpath, FOPEN_RTXT); /* bird: text */ 3387 3408 } 3388 3409 … … 3441 3462 if (image_in_brackets) 3442 3463 add_char (']'); 3443 3464 3444 3465 if (use_magic_cookie) 3445 3466 add_char ('"'); … … 3682 3703 expand to a context-sensitive macro (e.g. @xref) and produce 3683 3704 spurious warnings */ 3684 input_text_offset++; 3705 input_text_offset++; 3685 3706 execute_string ("%s", value); 3686 3707 input_text_offset--; -
trunk/texinfo/makeinfo/node.c
r2617 r2619 504 504 char *optr = otem; 505 505 int need_old = 0; 506 506 507 507 for (; *optr; optr++) 508 508 { … … 513 513 } 514 514 } 515 515 516 516 if (need_old) 517 517 { … … 974 974 975 975 if (!splitting && no_headers) 976 { /* cross refs need a name="#anchor" even if not writing headers */ 976 { /* cross refs need a name="#anchor" even if not writing headers */ 977 977 add_html_names (node); 978 978 } … … 984 984 add_word_args ("<p>%s\n", splitting ? "" : "<hr>"); 985 985 986 /* In the split HTML case, the filename is wrong for the 986 /* In the split HTML case, the filename is wrong for the 987 987 old-style converted names, but we'll add them anyway, for 988 988 consistency. (And we need them in the normal (not … … 995 995 add_word ((char *) _("Next:")); 996 996 add_word (" "); 997 997 998 998 add_word ("<a rel=\"next\" accesskey=\"n\" href=\""); 999 999 add_anchor_name (tem, 1); 1000 1000 tem = escape_string (tem); 1001 1001 add_word_args ("\">%s</a>", tem); 1002 1002 1003 1003 free (tem); 1004 1004 … … 1880 1880 char *split_basename = filename_part (split_filename); 1881 1881 1882 #ifdef __EMX__ 1883 fd = open (split_filename, 1884 O_WRONLY|O_TRUNC|O_CREAT|O_BINARY, 0666); 1885 #else 1882 1886 fd = open (split_filename, O_WRONLY|O_TRUNC|O_CREAT, 0666); 1887 #endif 1883 1888 if (fd < 0 1884 1889 || write (fd, the_header, header_size) != header_size … … 1918 1923 original again. We must use `output_stream', or 1919 1924 write_tag_table_indirect () won't know where to place the output. */ 1925 #ifdef __EMX__ 1926 output_stream = fopen (filename, FOPEN_WBIN); 1927 #else 1920 1928 output_stream = fopen (filename, "w"); 1929 #endif 1921 1930 if (!output_stream) 1922 1931 { -
trunk/texinfo/util/texindex.c
r2617 r2619 21 21 #include "system.h" 22 22 #include <getopt.h> 23 24 #ifdef __EMX__ 25 # include <stdlib.h> 26 #endif 23 27 24 28 static char *program_name = "texindex"; … … 158 162 tempcount = 0; 159 163 last_deleted_tempcount = 0; 164 165 #ifdef __EMX__ 166 _response(&argc, &argv); 167 _wildcard(&argc, &argv); 168 #endif 160 169 161 170 #ifdef HAVE_SETLOCALE
Note:
See TracChangeset
for help on using the changeset viewer.