Mercurial > hg > xemacs-beta
annotate netinstall/nio-ftp.cc @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -0600 |
| 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 } |