summaryrefslogtreecommitdiffstats
path: root/lib/libfetch/file.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>1998-11-06 22:14:08 +0000
committerdes <des@FreeBSD.org>1998-11-06 22:14:08 +0000
commit93ce759c73e21f7ac6642b79a8e6146522b452aa (patch)
treef7eca0835b20fb3b31b3e447f024ef540f77afe0 /lib/libfetch/file.c
parentf2ceee99496bf97c1d2ffff9c8e7fd6a79474f2e (diff)
downloadFreeBSD-src-93ce759c73e21f7ac6642b79a8e6146522b452aa.zip
FreeBSD-src-93ce759c73e21f7ac6642b79a8e6146522b452aa.tar.gz
Second of a series of cleanups to libfetch.
This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
Diffstat (limited to 'lib/libfetch/file.c')
-rw-r--r--lib/libfetch/file.c43
1 files changed, 36 insertions, 7 deletions
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 0c685ef..66a681f 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -25,25 +25,54 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: file.c,v 1.1.1.1 1998/07/09 16:52:41 des Exp $
*/
+#include <sys/types.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
#include "fetch.h"
+#include "common.h"
FILE *
-fetchGetFile(url_t *u, char *flags)
+fetchGetFile(struct url *u, char *flags)
{
- flags = flags; /* unused */
- return fopen(u->doc, "r");
+ FILE *f;
+
+ f = fopen(u->doc, "r");
+
+ if (f == NULL)
+ _fetch_syserr();
+ return f;
}
FILE *
-fetchPutFile(url_t *u, char *flags)
+fetchPutFile(struct url *u, char *flags)
{
+ FILE *f;
+
if (strchr(flags, 'a'))
- return fopen(u->doc, "a");
- else return fopen(u->doc, "w");
+ f = fopen(u->doc, "a");
+ else
+ f = fopen(u->doc, "w");
+
+ if (f == NULL)
+ _fetch_syserr();
+ return f;
+}
+
+int
+fetchStatFile(struct url *u, struct url_stat *us, char *flags)
+{
+ struct stat sb;
+
+ if (stat(u->doc, &sb) == -1) {
+ _fetch_syserr();
+ return -1;
+ }
+ us->size = sb.st_size;
+ us->time = sb.st_mtime;
+ return 0;
}
OpenPOWER on IntegriCloud