annotate netinstall/netio.h @ 4539:061e030e3270

Fix some bugs in load-history construction, built-in symbol file names. lib-src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.c (main): Allow more than one -d argument, followed by a directory to change to. (put_filename): Don't strip directory information; with previous change, allows retrieval of Lisp function and variable origin files from #'built-in-symbol-file relative to lisp-directory. (scan_lisp_file): Don't add an extraneous newline after the file name, put_filename has added the newline already. lisp/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * loadup.el (load-history): Add the contents of current-load-list to load-history before clearing it. Move the variable declarations earlier in the file to a format understood by make-docfile.c. * custom.el (custom-declare-variable): Add the variable's symbol to the current file's load history entry correctly, don't use a cons. Eliminate a comment that we don't need to worry about, we don't need to check the `initialized' C variable in Lisp. * bytecomp.el (byte-compile-output-file-form): Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here; treat #'custom-declare-variable correctly, generating the docstrings in a format understood by make-docfile.c. * loadhist.el (symbol-file): Correct behaviour for checking autoloaded macros and functions when supplied with a TYPE argument. Accept fully-qualified paths from #'built-in-symbol-file; if a path is not fully-qualified, return it relative to lisp-directory if the filename corresponds to a Lisp file, and relative to (concat source-directory "/src/") otherwise. * make-docfile.el (preloaded-file-list): Rationalise some let bindings a little. Use the "-d" argument to make-docfile.c to supply Lisp paths relative to lisp-directory, not absolutely. Add in loadup.el explicitly to the list of files to be processed by make-docfile.c--it doesn't make sense to add it to preloaded-file-list, since that is used for purposes of byte-compilation too. src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * doc.c (Fbuilt_in_symbol_file): Return a subr's filename immediately if we've found it. Check for compiled function and compiled macro docstrings in DOC too, and return them if they exist. The branch of the if statement focused on functions may have executed, but we may still want to check variable bindings; an else clause isn't appropriate.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 27 Dec 2008 14:05:50 +0000 (2008-12-27)
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* This is the parent class for all the access methods known to setup
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 (i.e. ways to download files from the internet or other sources */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 class NetIO {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 protected:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 NetIO (char *url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 void set_url (char *url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 public:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 /* if nonzero, this is the estimated total file size */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 int file_size;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 /* broken down url FYI */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 char *url;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 char *proto;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 char *host;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 int port;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 char *path;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 virtual ~NetIO ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 /* The user calls this function to create a suitable accessor for
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 the given URL. It uses the network setup state in state.h. If
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 anything fails, either the return values is NULL or the returned
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 object is !ok() */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 static NetIO * open (char *url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 /* If !ok() that means the transfer isn't happening. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 virtual int ok ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 /* Read `nbytes' bytes from the file. Returns zero when the file
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 is complete. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 virtual int read (char *buf, int nbytes);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 /* Helper functions for http/ftp protocols. Both return nonzero for
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 "cancel", zero for "ok". They set net_proxy_user, etc, in
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 state.h */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 int get_auth ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 int get_proxy_auth ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 };