X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fprint.c;h=3adf779f9d0bab569f4058f7cd74ed71c75204f0;hb=8102beb3c89559a36ffa287184fe7cae1d541de4;hp=afbbf0d5b83476b57eebe3c1f35bb332c551695a;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1 diff --git a/src/print.c b/src/print.c index afbbf0d..3adf779 100644 --- a/src/print.c +++ b/src/print.c @@ -1,6 +1,6 @@ /* Lisp object printing and output streams. Copyright (C) 1985, 1986, 1988, 1992-1995 Free Software Foundation, Inc. - Copyright (C) 1995, 1996, 2000 Ben Wing. + Copyright (C) 1995, 1996, 2000, 2002 Ben Wing. This file is part of XEmacs. @@ -182,7 +182,7 @@ std_handle_out_va (FILE *stream, const char *fmt, va_list args) int retval; retval = vsprintf ((char *) kludge, fmt, args); - if (initialized && !fatal_error_in_progress) + if (initialized && !inhibit_non_essential_printing_operations) TO_EXTERNAL_FORMAT (DATA, (kludge, strlen ((char *) kludge)), ALLOCA, (extptr, extlen), Qnative); @@ -261,9 +261,16 @@ write_string_to_stdio_stream (FILE *stream, struct console *con, { Bufbyte *puta = (Bufbyte *) alloca (len); memcpy (puta, str + offset, len); + + if (initialized && !inhibit_non_essential_printing_operations) TO_EXTERNAL_FORMAT (DATA, (puta, len), ALLOCA, (extptr, extlen), coding_system); + else + { + extptr = (Extbyte *) puta; + extlen = (Bytecount) len; + } } if (stream) @@ -507,21 +514,33 @@ write_c_string (const char *str, Lisp_Object stream) write_string_1 ((const Bufbyte *) str, strlen (str), stream); } +static void +write_fmt_string (Lisp_Object stream, const char *fmt, ...) +{ + va_list va; + char bigbuf[666]; + + va_start (va, fmt); + vsprintf (bigbuf, fmt, va); + va_end (va); + write_c_string (bigbuf, stream); +} + DEFUN ("write-char", Fwrite_char, 1, 2, 0, /* -Output character CH to stream STREAM. +Output character CHARACTER to stream STREAM. STREAM defaults to the value of `standard-output' (which see). */ - (ch, stream)) + (character, stream)) { /* This function can GC */ Bufbyte str[MAX_EMCHAR_LEN]; Bytecount len; - CHECK_CHAR_COERCE_INT (ch); - len = set_charptr_emchar (str, XCHAR (ch)); + CHECK_CHAR_COERCE_INT (character); + len = set_charptr_emchar (str, XCHAR (character)); output_string (canonicalize_printcharfun (stream), str, Qnil, 0, len); - return ch; + return character; } void @@ -673,7 +692,7 @@ DEFUN ("princ", Fprinc, 1, 2, 0, /* Output the printed representation of OBJECT, any Lisp object. No quoting characters are used; no delimiters are printed around the contents of strings. -Output stream is STREAM, or value of standard-output (which see). +Output stream is STREAM, or value of `standard-output' (which see). */ (object, stream)) { @@ -935,18 +954,19 @@ float_to_string (char *buf, double data) } #endif /* LISP_FLOAT_TYPE */ -/* Print NUMBER to BUFFER. This is equivalent to sprintf(buffer, - "%ld", number), only much faster. +/* Print NUMBER to BUFFER. + This is equivalent to sprintf (buffer, "%ld", number), only much faster. BUFFER should accept 24 bytes. This should suffice for the longest numbers on 64-bit machines, including the `-' sign and the trailing - \0. */ -void + '\0'. Returns a pointer to the trailing '\0'. */ +char * long_to_string (char *buffer, long number) { #if (SIZEOF_LONG != 4) && (SIZEOF_LONG != 8) /* Huh? */ sprintf (buffer, "%ld", number); + return buffer + strlen (buffer); #else /* (SIZEOF_LONG == 4) || (SIZEOF_LONG == 8) */ char *p = buffer; int force = 0; @@ -957,9 +977,9 @@ long_to_string (char *buffer, long number) number = -number; } -#define FROB(figure) do { \ - if (force || number >= figure) \ - *p++ = number / figure + '0', number %= figure, force = 1; \ +#define FROB(figure) do { \ + if (force || number >= figure) \ + *p++ = (char) (number / figure + '0'), number %= figure, force = 1; \ } while (0) #if SIZEOF_LONG == 8 FROB (1000000000000000000L); @@ -982,8 +1002,9 @@ long_to_string (char *buffer, long number) FROB (100); FROB (10); #undef FROB - *p++ = number + '0'; + *p++ = (char) (number + '0'); *p = '\0'; + return p; #endif /* (SIZEOF_LONG == 4) || (SIZEOF_LONG == 8) */ } @@ -1195,6 +1216,52 @@ internal_object_printer (Lisp_Object obj, Lisp_Object printcharfun, write_c_string (buf, printcharfun); } +enum printing_badness +{ + BADNESS_INTEGER_OBJECT, + BADNESS_POINTER_OBJECT, + BADNESS_NO_TYPE +}; + +static void +printing_major_badness (Lisp_Object printcharfun, + Char_ASCII *badness_string, int type, void *val, + enum printing_badness badness) +{ + char buf[666]; + + switch (badness) + { + case BADNESS_INTEGER_OBJECT: + sprintf (buf, "%s %d object %ld", badness_string, type, + (EMACS_INT) val); + break; + + case BADNESS_POINTER_OBJECT: + sprintf (buf, "%s %d object %p", badness_string, type, val); + break; + + case BADNESS_NO_TYPE: + sprintf (buf, "%s object %p", badness_string, val); + break; + } + + /* Don't ABORT or signal if called from debug_print() or already + crashing */ + if (!inhibit_non_essential_printing_operations) + { +#ifdef ERROR_CHECK_TYPES + ABORT (); +#else /* not ERROR_CHECK_TYPES */ + if (print_readably) + type_error (Qinternal_error, "printing %s", buf); +#endif /* not ERROR_CHECK_TYPES */ + } + write_fmt_string (printcharfun, + "#", buf); +} + void print_internal (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { @@ -1320,49 +1387,101 @@ print_internal (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) case Lisp_Type_Record: { struct lrecord_header *lheader = XRECORD_LHEADER (obj); - struct gcpro gcpro1, gcpro2; - if (CONSP (obj) || VECTORP(obj)) + /* Try to check for various sorts of bogus pointers if we're in a + situation where it may be likely -- i.e. called from + debug_print() or we're already crashing. In such cases, + (further) crashing is counterproductive. */ + + if (inhibit_non_essential_printing_operations && + !debug_can_access_memory (lheader, sizeof (*lheader))) + { + write_fmt_string (printcharfun, + "#", + lheader); + break; + } + + if (CONSP (obj) || VECTORP (obj)) { /* If deeper than spec'd depth, print placeholder. */ if (INTP (Vprint_level) && print_depth > XINT (Vprint_level)) { - GCPRO2 (obj, printcharfun); write_c_string ("...", printcharfun); - UNGCPRO; break; } } - GCPRO2 (obj, printcharfun); + if (lheader->type == lrecord_type_free) + { + printing_major_badness (printcharfun, "freed lrecord", 0, + lheader, BADNESS_NO_TYPE); + break; + } + else if (lheader->type == lrecord_type_undefined) + { + printing_major_badness (printcharfun, "lrecord_type_undefined", 0, + lheader, BADNESS_NO_TYPE); + break; + } + else if (lheader->type >= lrecord_type_count) + { + printing_major_badness (printcharfun, "illegal lrecord type", + (int) (lheader->type), + lheader, BADNESS_POINTER_OBJECT); + break; + } + + /* Further checks for bad memory in critical situations. We don't + normally do these because they may be expensive or weird + (e.g. under Unix we typically have to set a SIGSEGV handler and + try to trigger a seg fault). */ + + if (inhibit_non_essential_printing_operations) + { + const struct lrecord_implementation *imp = + LHEADER_IMPLEMENTATION (lheader); + + if (!debug_can_access_memory + (lheader, imp->size_in_bytes_method ? + imp->size_in_bytes_method (lheader) : + imp->static_size)) + { + write_fmt_string (printcharfun, + "#", + LHEADER_IMPLEMENTATION (lheader)->name, + lheader); + break; + } + + if (STRINGP (obj)) + { + Lisp_String *l = (Lisp_String *) lheader; + if (!debug_can_access_memory (l->data, l->size)) + { + write_fmt_string + (printcharfun, + "#", + lheader, l->data); + break; + } + } + } + if (LHEADER_IMPLEMENTATION (lheader)->printer) ((LHEADER_IMPLEMENTATION (lheader)->printer) (obj, printcharfun, escapeflag)); else default_object_printer (obj, printcharfun, escapeflag); - UNGCPRO; break; } default: { -#ifdef ERROR_CHECK_TYPECHECK - abort (); -#else /* not ERROR_CHECK_TYPECHECK */ - char buf[128]; /* We're in trouble if this happens! */ - if (print_readably) - error ("printing illegal data type #o%03o", - (int) XTYPE (obj)); - write_c_string ("#", - printcharfun); -#endif /* not ERROR_CHECK_TYPECHECK */ + printing_major_badness (printcharfun, "illegal data type", XTYPE (obj), + LISP_TO_VOID (obj), BADNESS_INTEGER_OBJECT); break; } } @@ -1420,6 +1539,7 @@ print_symbol (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) write_char_internal ("#", printcharfun); print_internal (XCDR (tem), printcharfun, escapeflag); write_char_internal ("#", printcharfun); + UNGCPRO; return; } else @@ -1604,22 +1724,24 @@ the output also will be logged to this file. } DEFUN ("open-termscript", Fopen_termscript, 1, 1, "FOpen termscript file: ", /* -Start writing all terminal output to FILE as well as the terminal. -FILE = nil means just close any termscript file currently open. +Start writing all terminal output to FILENAME as well as the terminal. +FILENAME = nil means just close any termscript file currently open. */ - (file)) + (filename)) { /* This function can GC */ if (termscript != 0) - fclose (termscript); - termscript = 0; + { + fclose (termscript); + termscript = 0; + } - if (! NILP (file)) + if (! NILP (filename)) { - file = Fexpand_file_name (file, Qnil); - termscript = fopen ((char *) XSTRING_DATA (file), "w"); + filename = Fexpand_file_name (filename, Qnil); + termscript = fopen ((char *) XSTRING_DATA (filename), "w"); if (termscript == NULL) - report_file_error ("Opening termscript", list1 (file)); + report_file_error ("Opening termscript", list1 (filename)); } return Qnil; } @@ -1648,6 +1770,7 @@ debug_print_no_newline (Lisp_Object debug_print_obj) print_depth = 0; print_readably = debug_print_readably != -1 ? debug_print_readably : 0; print_unbuffered++; + inhibit_non_essential_printing_operations = 1; /* Could use unwind-protect, but why bother? */ if (debug_print_length > 0) Vprint_length = make_int (debug_print_length); @@ -1667,6 +1790,7 @@ debug_print_no_newline (Lisp_Object debug_print_obj) Vprint_length = save_Vprint_length; print_depth = save_print_depth; print_readably = save_print_readably; + inhibit_non_essential_printing_operations = 0; print_unbuffered--; UNGCPRO; } @@ -1700,6 +1824,7 @@ debug_backtrace (void) print_depth = 0; print_readably = 0; print_unbuffered++; + inhibit_non_essential_printing_operations = 1; /* Could use unwind-protect, but why bother? */ if (debug_print_length > 0) Vprint_length = make_int (debug_print_length); @@ -1714,6 +1839,7 @@ debug_backtrace (void) Vprint_length = old_print_length; print_depth = old_print_depth; print_readably = old_print_readably; + inhibit_non_essential_printing_operations = 0; print_unbuffered--; UNGCPRO;