Mercurial > hg > xemacs-beta
annotate netinstall/nio-ftp.cc @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Mar 2010 01:22:51 -0500 |
| parents | 42a8626b741e |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* This file is responsible for implementing all direct FTP protocol | |
| 17 channels. It is intentionally simplistic. */ | |
| 18 | |
| 19 #include "win32.h" | |
| 20 #include "winsock.h" | |
| 21 #include <stdio.h> | |
| 22 #include <stdlib.h> | |
| 23 #include <ctype.h> | |
| 24 | |
| 25 #include "resource.h" | |
| 26 #include "state.h" | |
| 27 #include "simpsock.h" | |
| 28 #include "log.h" | |
| 29 | |
| 30 #include "netio.h" | |
| 31 #include "nio-ftp.h" | |
| 32 | |
| 33 static SimpleSocket *cmd = 0; | |
| 34 static char *cmd_host = 0; | |
| 35 static int cmd_port = 0; | |
| 36 | |
| 37 static char *last_line; | |
| 38 | |
| 39 static int | |
| 40 ftp_line (SimpleSocket *s) | |
| 41 { | |
| 42 do { | |
| 43 last_line = s->gets (); | |
| 44 log (LOG_BABBLE, "ftp > %s", last_line); | |
| 45 } while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' ')); | |
| 672 | 46 return atoi (last_line ?: "0"); |
| 448 | 47 } |
| 48 | |
| 49 NetIO_FTP::NetIO_FTP (char *Purl) | |
| 50 : NetIO (Purl) | |
| 51 { | |
| 52 s = 0; | |
| 53 int code; | |
| 54 | |
| 55 if (port == 0) | |
| 56 port = 21; | |
| 57 | |
| 58 if (cmd_host && strcmp (host, cmd_host) != 0 || port != cmd_port) | |
| 59 { | |
| 60 if (cmd) | |
| 61 cmd->printf ("QUIT\r\n"); | |
| 62 delete cmd; | |
| 63 free (cmd_host); | |
| 64 cmd = 0; | |
| 65 cmd_host = 0; | |
| 66 } | |
| 67 | |
| 68 if (cmd == 0) | |
| 69 { | |
| 70 SimpleSocket *c = new SimpleSocket (host, port); | |
| 71 code = ftp_line (c); | |
| 72 c->printf ("USER anonymous\r\n"); | |
| 73 code = ftp_line (c); | |
| 74 if (code == 331) | |
| 75 { | |
| 672 | 76 c->printf ("PASS xemacs-setup@\r\n"); |
| 448 | 77 code = ftp_line (c); |
| 78 } | |
| 79 | |
| 80 if (code < 200 || code >= 300) | |
| 81 { | |
| 82 delete c; | |
| 83 return; | |
| 84 } | |
| 85 | |
| 86 cmd = c; | |
| 87 cmd_host = _strdup (host); | |
| 88 cmd_port = port; | |
| 89 | |
| 90 cmd->printf ("TYPE I\r\n"); | |
| 91 code = ftp_line (cmd); | |
| 92 } | |
| 93 | |
| 94 cmd->printf ("PASV\r\n"); | |
| 95 do { | |
| 96 code = ftp_line (cmd); | |
| 97 } while (code == 226); /* previous RETR */ | |
| 98 if (code != 227) | |
| 99 return; | |
| 100 | |
| 101 char *paren = strchr (last_line, '('); | |
| 102 if (!paren) | |
| 103 return; | |
| 104 | |
| 105 int i1, i2, i3, i4, p1, p2; | |
| 106 sscanf (paren+1, "%d,%d,%d,%d,%d,%d", &i1, &i2, &i3, &i4, &p1, &p2); | |
| 107 char tmp[20]; | |
| 108 sprintf (tmp, "%d.%d.%d.%d", i1, i2, i3, i4); | |
| 109 s = new SimpleSocket (tmp, p1*256 + p2); | |
| 110 | |
| 111 cmd->printf ("RETR %s\r\n", path); | |
| 112 code = ftp_line (cmd); | |
| 113 if (code != 150) | |
| 114 { | |
| 115 delete s; | |
| 116 s = 0; | |
| 117 return; | |
| 118 } | |
| 119 } | |
| 120 | |
| 121 NetIO_FTP::~NetIO_FTP () | |
| 122 { | |
| 123 if (s) | |
| 124 delete s; | |
| 125 } | |
| 126 | |
| 127 int | |
| 128 NetIO_FTP::ok () | |
| 129 { | |
| 130 if (s) | |
| 131 return 1; | |
| 132 return 0; | |
| 133 } | |
| 134 | |
| 135 int | |
| 136 NetIO_FTP::read (char *buf, int nbytes) | |
| 137 { | |
| 138 if (!s) | |
| 139 return 0; | |
| 140 return s->read (buf, nbytes); | |
| 141 } |