Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 4953:304aebb79cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
function renamings to track names of char typedefs -------------------- ChangeLog entries follow: -------------------- man/ChangeLog addition: 2010-01-27 Ben Wing <ben@xemacs.org> * internals/internals.texi (lrecords): * internals/internals.texi (The DFC API): * internals/internals.texi (Conversion to and from External Data): * internals/internals.texi (Mule-izing Code): * internals/internals.texi (Pervasive changes throughout XEmacs sources): * internals/internals.texi (Ben's README): * internals/internals.texi (Future Work -- Localized Text/Messages): * emodules.texi (Defining Variables): Rename: write_c_string -> write_cistring build_intstring -> build_istring build_string -> build_cistring build_ext_string -> build_extstring make_ext_string -> make_extstring buffer_insert_c_string -> buffer_insert_ascstring intern_int -> intern_istring See comment in src/ChangeLog about this. modules/ChangeLog addition: 2010-01-27 Ben Wing <ben@xemacs.org> * postgresql/postgresql.c (print_pgconn): * postgresql/postgresql.c (print_pgresult): * postgresql/postgresql.c (Fpq_conn_defaults): * postgresql/postgresql.c (Fpq_pgconn): * postgresql/postgresql.c (Fpq_res_status): * postgresql/postgresql.c (Fpq_result_error_message): * postgresql/postgresql.c (Fpq_fname): * postgresql/postgresql.c (Fpq_get_value): * postgresql/postgresql.c (Fpq_cmd_status): * postgresql/postgresql.c (Fpq_cmd_tuples): * postgresql/postgresql.c (Fpq_notifies): * postgresql/postgresql.c (Fpq_get_line): * postgresql/postgresql.c (Fpq_get_line_async): * postgresql/postgresql.c (FROB): * postgresql/postgresql.c (init_postgresql_from_environment): * ldap/eldap.c: * ldap/eldap.c (Fldap_open): * ldap/eldap.c (Fldap_search_basic): * canna/canna_api.c: * canna/canna_api.c (make_euc_string): Rename: write_c_string -> write_cistring build_intstring -> build_istring build_string -> build_cistring build_ext_string -> build_extstring make_ext_string -> make_extstring buffer_insert_c_string -> buffer_insert_ascstring intern_int -> intern_istring See comment in src/ChangeLog about this. src/ChangeLog addition: 2010-01-27 Ben Wing <ben@xemacs.org> * .gdbinit.in.in: * README: * abbrev.c (write_abbrev): * abbrev.c (describe_abbrev): * alloc.c (make_extstring): * alloc.c (build_istring): * alloc.c (build_cistring): * alloc.c (build_ascstring): * alloc.c (build_extstring): * alloc.c (build_msg_istring): * alloc.c (build_defer_istring): * buffer.c (Fgenerate_new_buffer_name): * buffer.c (init_buffer_2): * console-tty.c (tty_init_console): * console-x.c (get_display_arg_connection): * console-x.c (x_perhaps_init_unseen_key_defaults): * database.c (dbm_map): * database.c (dbm_get): * database.c (berkdb_get): * database.c (berkdb_map): * device-gtk.c (FROB_PIXMAP): * device-gtk.c (Fgtk_style_info): * device-msw.c (msprinter_default_printer): * device-msw.c (sync_printer_with_devmode): * device-x.c (coding_system_of_xrm_database): * device-x.c (x_init_device): * device-x.c (signal_if_x_error): * device-x.c (Fx_get_resource): * device-x.c (Fx_server_vendor): * device-x.c (Fx_get_font_path): * dialog-x.c (maybe_run_dbox_text_callback): * doc.c (extract_object_file_name): * doc.c (unparesseuxify_doc_string): * doc.c (get_doc_string): * doc.c (get_object_file_name): * doc.c (Fdocumentation): * doc.c (Fsnarf_documentation): * doc.c (Fsubstitute_command_keys): * editfns.c (init_editfns): * editfns.c (Ftemp_directory): * editfns.c (Fuser_login_name): * editfns.c (Fuser_real_login_name): * editfns.c (Fuser_home_directory): * editfns.c (Fformat_time_string): * editfns.c (Fcurrent_time_string): * editfns.c (Fcurrent_time_zone): * emacs.c: * emacs.c (main_1): * emodules.c (Flist_modules): * emodules.c (emodules_load): * emodules.c (emodules_doc_sym): * emodules.c (vars_of_module): * event-Xt.c (x_has_keysym): * event-gtk.c (emacs_gtk_format_magic_event): * event-gtk.c (dragndrop_data_received): * event-gtk.c (gtk_reset_key_mapping): * event-msw.c (mswindows_dde_callback): * event-msw.c (mswindows_wnd_proc): * faces.c (complex_vars_of_faces): * file-coding.c (find_coding_system): * file-coding.c (setup_eol_coding_systems): * file-coding.c (make_coding_system_1): * file-coding.c (snarf_coding_system): * fileio.c: * fileio.c (lisp_strerror): * fileio.c (Ffile_name_directory): * fileio.c (Ffile_name_as_directory): * fileio.c (Fdirectory_file_name): * fileio.c (if): * fileio.c (Ffile_symlink_p): * fileio.c (Fencrypt_string): * fileio.c (Fdecrypt_string): * filelock.c (lock_file): * filelock.c (Ffile_locked_p): * floatfns.c (matherr): * font-mgr.c (build_fcapi_string): * font-mgr.c (make_xlfd_font_regexp): * frame-msw.c (mswindows_window_id): * frame-msw.c (mswindows_frame_property): * frame-x.c: * frame-x.c (color_to_string): * frame-x.c (maybe_set_frame_title_format): * frame-x.c (x_cde_transfer_callback): * frame-x.c (Fx_window_id): * glade.c (connector): * glade.c (Fglade_xml_textdomain): * glade.c (syms_of_glade): * glyphs-eimage.c (jpeg_instantiate): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate): * glyphs-gtk.c (font_instantiate): * glyphs-gtk.c (BUILD_GLYPH_INST): * glyphs-x.c (x_locate_pixmap_file): * glyphs-x.c (font_instantiate): * glyphs-x.c (x_widget_property): * glyphs-x.c (BUILD_GLYPH_INST): * glyphs.c (print_image_instance): * glyphs.c (bitmap_to_lisp_data): * glyphs.c (pixmap_to_lisp_data): * gpmevent.c (turn_off_gpm): * gpmevent.c (Fgpm_enabled_p): * gpmevent.c (Fgpm_enable): * gtk-glue.c (__make_string_mapper): * gtk-glue.c (xemacs_gtklist_to_list): * gtk-xemacs.c (FROB_FACE): * gtk-xemacs.c (xemacs_gtk_convert_color): * hpplay.c (player_error_internal): * hpplay.c (myHandler): * insdel.c (buffer_insert_ascstring_1): * insdel.h: * insdel.h (buffer_insert_ascstring): * intl.c (Fcurrent_locale): * intl.c (Fset_current_locale): * keymap.c (make_key_description): * keymap.c (Ftext_char_description): * keymap.c (describe_command): * keymap.c (describe_map): * lisp.h: * lread.c: * lread.c (locate_file_in_directory_mapper): * lread.c (locate_file_construct_suffixed_files_mapper): * mule-charset.c (Fmake_charset): * nt.c (Fmswindows_short_file_name): * nt.c (Fmswindows_long_file_name): * objects-gtk.c (__get_gtk_font_truename): * objects-gtk.c (__gtk_font_list_internal): * objects-msw.c (font_enum_callback_2): * objects-msw.c (create_hfont_from_font_spec): * objects-msw.c (mswindows_font_list): * objects-msw.c (mswindows_font_spec_matches_charset_stage_2): * objects-tty.c (tty_initialize_font_instance): * objects-x.c (x_font_truename): * objects-x.c (x_font_instance_truename): * objects-x.c (x_font_instance_properties): * objects-x.c (x_font_list): * print.c (write_cistring): * print.c (print_vector_internal): * print.c (print_cons): * process-nt.c (nt_canonicalize_host_name): * process-unix.c (unix_create_process): * process-unix.c (unix_canonicalize_host_name): * process.c (status_message): * process.c (status_notify): * process.c (init_xemacs_process): * process.c (syms_of_process): * redisplay-tty.c (term_get_fkeys_1): * redisplay-tty.c (CONDITIONAL_REASSIGN): * search.c (compile_pattern_1): * select-common.h (selection_data_to_lisp_data): * select-gtk.c (atom_to_symbol): * select-gtk.c (PROCESSING_GTK_CODE): * select-msw.c (mswindows_get_foreign_selection): * select-x.c (x_atom_to_symbol): * select-x.c (Fx_get_cutbuffer_internal): * symbols.c (intern_istring): * symbols.c (intern): * symbols.c (intern_converting_underscores_to_dashes): * symbols.c (Fintern): * sysdep.c (init_system_name): * sysdll.c (dll_error): * sysdll.c (dll_open): * syswindows.h: * syswindows.h (build_tstr_string): * tests.c (DFC_CHECK_LENGTH): * tests.c (DFC_CHECK_CONTENT): * tests.c (DFC_RESULT_PASS): * tests.c (Ftest_data_format_conversion): * text.c: * text.c (new_dfc_convert_now_damn_it): * text.h: * text.h (build_wext_string): * tooltalk.c (tt_build_c_string): * tooltalk.c (Ftooltalk_default_procid): * tooltalk.c (Ftooltalk_default_session): * tooltalk.c (init_tooltalk): * ui-byhand.c (Fgtk_clist_get_text): * ui-byhand.c (Fgtk_clist_get_pixtext): * ui-byhand.c (Fgtk_label_get): * ui-byhand.c (Fgtk_notebook_query_tab_label_packing): * ui-gtk.c (emacs_gtk_object_printer): * ui-gtk.c (emacs_gtk_boxed_printer): * ui-gtk.c (gtk_type_to_lisp): * ui-gtk.c (symbol_to_enum): * ui-gtk.c (enum_to_symbol): * unexaix.c (report_error): * unexaix.c (ERROR0): * unexec.c (report_error): * unexec.c (ERROR0): * unicode.c (unicode_to_ichar): * win32.c (tstr_to_local_file_format): * win32.c (Fmswindows_cygwin_to_win32_path): * win32.c (struct read_link_hash): * xemacs.def.in.in: Rename: write_c_string -> write_cistring build_intstring -> build_istring build_string -> build_cistring build_ext_string -> build_extstring make_ext_string -> make_extstring buffer_insert_c_string -> buffer_insert_ascstring intern_int -> intern_istring These functions have been renamed so that the naming harmonizes with the typedefs for strings: `cistring' along with CIbyte *, `istring' along with Ibyte *, `extstring' along with Extbyte *, `ascstring' along with Ascbyte *. Also make buffer_insert_ascstring take Ascbyte * and assert that its argument is ASCII.
author Ben Wing <ben@xemacs.org>
date Wed, 27 Jan 2010 00:35:36 -0600
parents 19a72041c5ed
children 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4952:19a72041c5ed 4953:304aebb79cd3
180 Extbyte *ret = strerror (errnum); 180 Extbyte *ret = strerror (errnum);
181 if (!ret) 181 if (!ret)
182 { 182 {
183 Ibyte ffff[99]; 183 Ibyte ffff[99];
184 qxesprintf (ffff, "Unknown error %d", errnum); 184 qxesprintf (ffff, "Unknown error %d", errnum);
185 return build_intstring (ffff); 185 return build_istring (ffff);
186 } 186 }
187 return build_ext_string (ret, Qstrerror_encoding); 187 return build_extstring (ret, Qstrerror_encoding);
188 } 188 }
189 189
190 static Lisp_Object 190 static Lisp_Object
191 close_file_unwind (Lisp_Object fd) 191 close_file_unwind (Lisp_Object fd)
192 { 192 {
427 Ibyte *newbeg = alloca_ibytes (len + 1); 427 Ibyte *newbeg = alloca_ibytes (len + 1);
428 428
429 qxestrncpy (newbeg, beg, len); 429 qxestrncpy (newbeg, beg, len);
430 newbeg[len] = '\0'; 430 newbeg[len] = '\0';
431 newbeg = mswindows_canonicalize_filename (newbeg); 431 newbeg = mswindows_canonicalize_filename (newbeg);
432 return build_intstring (newbeg); 432 return build_istring (newbeg);
433 } 433 }
434 #endif 434 #endif
435 #endif /* not WIN32_NATIVE */ 435 #endif /* not WIN32_NATIVE */
436 return make_string (beg, p - beg); 436 return make_string (beg, p - beg);
437 } 437 }
547 return call2_check_string (handler, Qfile_name_as_directory, filename); 547 return call2_check_string (handler, Qfile_name_as_directory, filename);
548 548
549 buf = alloca_ibytes (XSTRING_LENGTH (filename) + 10); 549 buf = alloca_ibytes (XSTRING_LENGTH (filename) + 10);
550 file_name_as_directory (buf, XSTRING_DATA (filename)); 550 file_name_as_directory (buf, XSTRING_DATA (filename));
551 if (qxestrcmp (buf, XSTRING_DATA (filename))) 551 if (qxestrcmp (buf, XSTRING_DATA (filename)))
552 return build_intstring (buf); 552 return build_istring (buf);
553 else 553 else
554 return filename; 554 return filename;
555 } 555 }
556 556
557 /* 557 /*
604 handler = Ffind_file_name_handler (directory, Qdirectory_file_name); 604 handler = Ffind_file_name_handler (directory, Qdirectory_file_name);
605 if (!NILP (handler)) 605 if (!NILP (handler))
606 return call2_check_string (handler, Qdirectory_file_name, directory); 606 return call2_check_string (handler, Qdirectory_file_name, directory);
607 buf = alloca_ibytes (XSTRING_LENGTH (directory) + 20); 607 buf = alloca_ibytes (XSTRING_LENGTH (directory) + 20);
608 directory_file_name (XSTRING_DATA (directory), buf); 608 directory_file_name (XSTRING_DATA (directory), buf);
609 return build_intstring (buf); 609 return build_istring (buf);
610 } 610 }
611 611
612 /* Fmake_temp_name used to be a simple wrapper around mktemp(), but it 612 /* Fmake_temp_name used to be a simple wrapper around mktemp(), but it
613 proved too broken for our purposes (it supported only 26 or 62 613 proved too broken for our purposes (it supported only 26 or 62
614 unique names under some implementations). For example, this 614 unique names under some implementations). For example, this
944 944
945 if (IS_DIRECTORY_SEP (nm[1])) 945 if (IS_DIRECTORY_SEP (nm[1]))
946 { 946 {
947 newnm = mswindows_canonicalize_filename (nm); 947 newnm = mswindows_canonicalize_filename (nm);
948 if (qxestrcmp (newnm, XSTRING_DATA (name)) != 0) 948 if (qxestrcmp (newnm, XSTRING_DATA (name)) != 0)
949 name = build_intstring (newnm); 949 name = build_istring (newnm);
950 } 950 }
951 else 951 else
952 { 952 {
953 /* drive must be set, so this is okay */ 953 /* drive must be set, so this is okay */
954 newnm = mswindows_canonicalize_filename (nm - 2); 954 newnm = mswindows_canonicalize_filename (nm - 2);
955 if (qxestrcmp (newnm, XSTRING_DATA (name)) != 0) 955 if (qxestrcmp (newnm, XSTRING_DATA (name)) != 0)
956 { 956 {
957 name = build_intstring (newnm); 957 name = build_istring (newnm);
958 XSTRING_DATA (name)[0] = DRIVE_LETTER (drive); 958 XSTRING_DATA (name)[0] = DRIVE_LETTER (drive);
959 XSTRING_DATA (name)[1] = ':'; 959 XSTRING_DATA (name)[1] = ':';
960 } 960 }
961 } 961 }
962 xfree (newnm, Ibyte *); 962 xfree (newnm, Ibyte *);
965 #endif /* WIN32_FILENAMES */ 965 #endif /* WIN32_FILENAMES */
966 #ifndef WIN32_NATIVE 966 #ifndef WIN32_NATIVE
967 if (nm == XSTRING_DATA (name)) 967 if (nm == XSTRING_DATA (name))
968 RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, name); 968 RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, name);
969 RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, 969 RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name,
970 build_intstring (nm)); 970 build_istring (nm));
971 #endif /* not WIN32_NATIVE */ 971 #endif /* not WIN32_NATIVE */
972 } 972 }
973 } 973 }
974 974
975 /* At this point, nm might or might not be an absolute file name. We 975 /* At this point, nm might or might not be an absolute file name. We
1330 1330
1331 *o = '\0'; 1331 *o = '\0';
1332 1332
1333 { 1333 {
1334 Ibyte *newtarget = mswindows_canonicalize_filename (target); 1334 Ibyte *newtarget = mswindows_canonicalize_filename (target);
1335 Lisp_Object result = build_intstring (newtarget); 1335 Lisp_Object result = build_istring (newtarget);
1336 xfree (newtarget, Ibyte *); 1336 xfree (newtarget, Ibyte *);
1337 1337
1338 RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, result); 1338 RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, result);
1339 } 1339 }
1340 #else /* not WIN32_FILENAMES */ 1340 #else /* not WIN32_FILENAMES */
2605 2605
2606 fname = mswindows_read_link (path); 2606 fname = mswindows_read_link (path);
2607 if (!fname) 2607 if (!fname)
2608 return Qnil; 2608 return Qnil;
2609 { 2609 {
2610 Lisp_Object val = build_intstring (fname); 2610 Lisp_Object val = build_istring (fname);
2611 xfree (fname, Ibyte *); 2611 xfree (fname, Ibyte *);
2612 return val; 2612 return val;
2613 } 2613 }
2614 } 2614 }
2615 return Qnil; 2615 return Qnil;
3856 memcpy (raw_key, key_ext, key_size); 3856 memcpy (raw_key, key_ext, key_size);
3857 memset (raw_key + key_size, 0, (CRYPT_KEY_SIZE + 1) - key_size); 3857 memset (raw_key + key_size, 0, (CRYPT_KEY_SIZE + 1) - key_size);
3858 3858
3859 ecb_crypt (raw_key, encrypted_string, rounded_size, 3859 ecb_crypt (raw_key, encrypted_string, rounded_size,
3860 DES_ENCRYPT | DES_SW); 3860 DES_ENCRYPT | DES_SW);
3861 return make_ext_string (encrypted_string, rounded_size, Qbinary); 3861 return make_extstring (encrypted_string, rounded_size, Qbinary);
3862 } 3862 }
3863 3863
3864 DEFUN ("decrypt-string", Fdecrypt_string, 2, 2, 0, /* 3864 DEFUN ("decrypt-string", Fdecrypt_string, 2, 2, 0, /*
3865 Decrypt STRING using KEY. 3865 Decrypt STRING using KEY.
3866 */ 3866 */
3887 memcpy (raw_key, key_ext, key_size); 3887 memcpy (raw_key, key_ext, key_size);
3888 memset (raw_key + key_size, 0, (CRYPT_KEY_SIZE + 1) - key_size); 3888 memset (raw_key + key_size, 0, (CRYPT_KEY_SIZE + 1) - key_size);
3889 3889
3890 3890
3891 ecb_crypt (raw_key, decrypted_string, string_size, D | DES_SW); 3891 ecb_crypt (raw_key, decrypted_string, string_size, D | DES_SW);
3892 return make_ext_string (decrypted_string, string_size - 1, Qbinary); 3892 return make_extstring (decrypted_string, string_size - 1, Qbinary);
3893 } 3893 }
3894 #endif /* 0 */ 3894 #endif /* 0 */
3895 3895
3896 3896
3897 DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime, 1, 1, 0, /* 3897 DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime, 1, 1, 0, /*