X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffile-handle-def.c;h=3be48250e85c3b35dfef883acc4b03a6443e7ba6;hb=053e7ff6e0a45a25d5604b211e9c950fff50e75d;hp=605d1dd942a248f0fdc3bdda53ade1228ed79c15;hpb=cc56bd9dc9ecf718111aaf16022f0fe8883a5487;p=pspp-builds.git diff --git a/src/file-handle-def.c b/src/file-handle-def.c index 605d1dd9..3be48250 100644 --- a/src/file-handle-def.c +++ b/src/file-handle-def.c @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. Written by Ben Pfaff . This program is free software; you can redistribute it and/or @@ -18,23 +18,22 @@ 02110-1301, USA. */ #include -#include "file-handle.h" #include "file-handle-def.h" #include "error.h" #include #include #include #include "alloc.h" +#include "file-handle.h" #include "filename.h" #include "command.h" #include "getl.h" #include "error.h" #include "magic.h" #include "var.h" -#include "file-handle-def.h" +#include "scratch-handle.h" #include "gettext.h" - #define _(msgid) gettext (msgid) /* (headers) */ @@ -43,60 +42,78 @@ struct file_handle { struct file_handle *next; /* Next in global list. */ + int open_cnt; /* 0=not open, otherwise # of openers. */ + bool deleted; /* Destroy handle when open_cnt goes to 0? */ + char *name; /* File handle identifier. */ + const char *type; /* If open, type of file. */ + char open_mode[3]; /* "[rw][se]". */ + void *aux; /* Aux data pointer for owner if any. */ + enum fh_referent referent; /* What the file handle refers to. */ + + /* FH_REF_FILE only. */ char *filename; /* Filename as provided by user. */ struct file_identity *identity; /* For checking file identity. */ - struct file_locator where; /* Used for reporting error messages. */ enum fh_mode mode; /* File mode. */ + + /* FH_REF_FILE and FH_REF_INLINE only. */ size_t record_width; /* Length of fixed-format records. */ size_t tab_width; /* Tab width, 0=do not expand tabs. */ - int open_cnt; /* 0=not open, otherwise # of openers. */ - const char *type; /* If open, type of file. */ - char open_mode[3]; /* "[rw][se]". */ - void *aux; /* Aux data pointer for owner if any. */ + /* FH_REF_SCRATCH only. */ + struct scratch_handle *sh; /* Scratch file data. */ }; +/* List of all handles. */ static struct file_handle *file_handles; +/* Default file handle for DATA LIST, REREAD, REPEATING DATA + commands. */ +static struct file_handle *default_handle; + +/* The "file" that reads from BEGIN DATA...END DATA. */ +static struct file_handle *inline_file; + +static struct file_handle *create_handle (const char *name, enum fh_referent); + /* File handle initialization routine. */ void fh_init (void) { - /* Currently nothing to do. */ + inline_file = create_handle ("INLINE", FH_REF_INLINE); + inline_file->record_width = 80; + inline_file->tab_width = 8; } - -/* Destroy file handle. - Normally needed only if a file_handle needs to be re-assigned. - Otherwise, just let fh_done clean destroy the handle. - */ -void -fh_free(struct file_handle *fh) +/* Free HANDLE and remove it from the global list. */ +static void +free_handle (struct file_handle *handle) { - if ( !fh->name ) - return ; - - free (fh->name); - fh->name = 0; - free (fh->filename); - fn_free_identity (fh->identity); - free (fh); -} + /* Remove handle from global list. */ + if (file_handles == handle) + file_handles = handle->next; + else + { + struct file_handle *iter = file_handles; + while (iter->next != handle) + iter = iter->next; + iter->next = handle->next; + } + /* Free data. */ + free (handle->name); + free (handle->filename); + fn_free_identity (handle->identity); + scratch_handle_destroy (handle->sh); + free (handle); +} /* Frees all the file handles. */ void fh_done (void) { - struct file_handle *fh, *next; - - for (fh = file_handles; fh != NULL; fh = next) - { - next = fh->next; - fh_free(fh); - } - file_handles = NULL; + while (file_handles != NULL) + free_handle (file_handles); } /* Returns the handle named HANDLE_NAME, or a null pointer if @@ -107,7 +124,7 @@ fh_from_name (const char *handle_name) struct file_handle *iter; for (iter = file_handles; iter != NULL; iter = iter->next) - if (!strcasecmp (handle_name, iter->name)) + if (!iter->deleted && !strcasecmp (handle_name, iter->name)) return iter; return NULL; } @@ -127,7 +144,9 @@ fh_from_filename (const char *filename) if (identity != NULL) { for (iter = file_handles; iter != NULL; iter = iter->next) - if (iter->identity != NULL + if (!iter->deleted + && iter->referent == FH_REF_FILE + && iter->identity != NULL && !fn_compare_file_identities (identity, iter->identity)) { fn_free_identity (identity); @@ -138,40 +157,69 @@ fh_from_filename (const char *filename) /* Then check for a file with the same name. */ for (iter = file_handles; iter != NULL; iter = iter->next) - if (!strcmp (filename, iter->filename)) + if (!iter->deleted + && iter->referent == FH_REF_FILE && !strcmp (filename, iter->filename)) return iter; return NULL; } -/* Creates and returns a new file handle with the given values - and defaults for other values. Adds the created file handle - to the global list. */ -struct file_handle * -fh_create (const char *handle_name, const char *filename, - const struct fh_properties *properties) -{ - struct file_handle *handle; - - assert(filename); - assert(handle_name); +/* Creates a new handle with name HANDLE_NAME that refers to + REFERENT. Links the new handle into the global list. Returns + the new handle. - /* Create and initialize file handle. */ - handle = xmalloc (sizeof *handle); + The new handle is not fully initialized. The caller is + responsible for completing its initialization. */ +static struct file_handle * +create_handle (const char *handle_name, enum fh_referent referent) +{ + struct file_handle *handle = xzalloc (sizeof *handle); handle->next = file_handles; + handle->open_cnt = 0; + handle->deleted = false; handle->name = xstrdup (handle_name); + handle->type = NULL; + handle->aux = NULL; + handle->referent = referent; + file_handles = handle; + return handle; +} + +/* Returns the unique handle of referent type FH_REF_INLINE, + which refers to the "inline file" that represents character + data in the command file between BEGIN DATA and END DATA. */ +struct file_handle * +fh_inline_file (void) +{ + return inline_file; +} + +/* Creates a new file handle named HANDLE_NAME, which must not be + the name of an existing file handle. The new handle is + associated with file FILENAME and the given PROPERTIES. */ +struct file_handle * +fh_create_file (const char *handle_name, const char *filename, + const struct fh_properties *properties) +{ + struct file_handle *handle; + assert (fh_from_name (handle_name) == NULL); + handle = create_handle (handle_name, FH_REF_FILE); handle->filename = xstrdup (filename); handle->identity = fn_get_identity (filename); - handle->where.filename = handle->filename; - handle->where.line_number = 0; handle->mode = properties->mode; handle->record_width = properties->record_width; handle->tab_width = properties->tab_width; - handle->open_cnt = 0; - handle->type = NULL; - handle->aux = NULL; - file_handles = handle; + return handle; +} +/* Creates a new file handle named HANDLE_NAME, which must not be + the name of an existing file handle. The new handle is + associated with a scratch file (initially empty). */ +struct file_handle * +fh_create_scratch (const char *handle_name) +{ + struct file_handle *handle = create_handle (handle_name, FH_REF_SCRATCH); + handle->sh = NULL; return handle; } @@ -179,10 +227,31 @@ fh_create (const char *handle_name, const char *filename, const struct fh_properties * fh_default_properties (void) { - static const struct fh_properties default_properties = {MODE_TEXT, 1024, 4}; + static const struct fh_properties default_properties + = {FH_MODE_TEXT, 1024, 4}; return &default_properties; } +/* Deletes FH from the global list of file handles. Afterward, + attempts to search for it will fail. Unless the file handle + is currently open, it will be destroyed; otherwise, it will be + destroyed later when it is closed. + Normally needed only if a file_handle needs to be re-assigned. + Otherwise, just let fh_done() destroy the handle. */ +void +fh_free (struct file_handle *handle) +{ + if (handle == fh_inline_file () || handle == NULL || handle->deleted) + return; + handle->deleted = true; + + if (handle == default_handle) + default_handle = fh_inline_file (); + + if (handle->open_cnt == 0) + free_handle (handle); +} + /* Returns an English description of MODE, which is in the format of the MODE argument to fh_open(). */ static const char * @@ -196,6 +265,9 @@ mode_name (const char *mode) /* Tries to open handle H with the given TYPE and MODE. + H's referent type must be one of the bits in MASK. The caller + must verify this ahead of time; we simply assert it here. + TYPE is the sort of file, e.g. "system file". Only one given type of access is allowed on a given file handle at once. If successful, a reference to TYPE is retained, so it should @@ -213,9 +285,11 @@ mode_name (const char *mode) modes the void * will necessarily be null only if no other sharers are active. */ void ** -fh_open (struct file_handle *h, const char *type, const char *mode) +fh_open (struct file_handle *h, enum fh_referent mask UNUSED, + const char *type, const char *mode) { assert (h != NULL); + assert ((fh_get_referent (h) & mask) != 0); assert (type != NULL); assert (mode != NULL); assert (mode[0] == 'r' || mode[0] == 'w'); @@ -227,21 +301,21 @@ fh_open (struct file_handle *h, const char *type, const char *mode) if (strcmp (h->type, type)) { msg (SE, _("Can't open %s as a %s because it is " - "already open as a %s"), + "already open as a %s."), fh_get_name (h), type, h->type); return NULL; } else if (strcmp (h->open_mode, mode)) { msg (SE, _("Can't open %s as a %s for %s because it is " - "already open for %s"), + "already open for %s."), fh_get_name (h), type, mode_name (mode), mode_name (h->open_mode)); return NULL; } else if (h->open_mode[1] == 'e') { - msg (SE, _("Can't re-open %s as a %s for %s"), + msg (SE, _("Can't re-open %s as a %s for %s."), fh_get_name (h), type, mode_name (mode)); return NULL; } @@ -260,7 +334,11 @@ fh_open (struct file_handle *h, const char *type, const char *mode) /* Closes file handle H, which must have been open for the specified TYPE and MODE of access provided to fh_open(). Returns zero if the file is now closed, nonzero if it is still - open due to another reference. */ + open due to another reference. + + After fh_close() returns zero for a handle, it is unsafe to + reference that file handle again in any way, because its + storage may have been freed. */ int fh_close (struct file_handle *h, const char *type, const char *mode) { @@ -271,13 +349,23 @@ fh_close (struct file_handle *h, const char *type, const char *mode) assert (mode != NULL); assert (!strcmp (mode, h->open_mode)); - h->open_cnt--; - if (h->open_cnt == 0) + if (--h->open_cnt == 0) { h->type = NULL; h->aux = NULL; + if (h->deleted) + free_handle (h); + return 0; } - return h->open_cnt; + return 1; +} + +/* Is the file open? BEGIN DATA...END DATA uses this to detect + whether the inline file is actually in use. */ +bool +fh_is_open (const struct file_handle *handle) +{ + return handle->open_cnt > 0; } /* Returns the identifier of file HANDLE. If HANDLE was created @@ -289,15 +377,21 @@ fh_close (struct file_handle *h, const char *type, const char *mode) const char * fh_get_name (const struct file_handle *handle) { - assert (handle != NULL); return handle->name; } +/* Returns the type of object that HANDLE refers to. */ +enum fh_referent +fh_get_referent (const struct file_handle *handle) +{ + return handle->referent; +} + /* Returns the name of the file associated with HANDLE. */ const char * fh_get_filename (const struct file_handle *handle) { - assert (handle != NULL); + assert (handle->referent == FH_REF_FILE); return handle->filename; } @@ -305,7 +399,7 @@ fh_get_filename (const struct file_handle *handle) enum fh_mode fh_get_mode (const struct file_handle *handle) { - assert (handle != NULL); + assert (handle->referent == FH_REF_FILE); return handle->mode; } @@ -313,16 +407,50 @@ fh_get_mode (const struct file_handle *handle) size_t fh_get_record_width (const struct file_handle *handle) { - assert (handle != NULL); + assert (handle->referent & (FH_REF_FILE | FH_REF_INLINE)); return handle->record_width; } /* Returns the number of characters per tab stop for HANDLE, or zero if tabs are not to be expanded. Applicable only to - MODE_TEXT files. */ + FH_MODE_TEXT files. */ size_t fh_get_tab_width (const struct file_handle *handle) { - assert (handle != NULL); + assert (handle->referent & (FH_REF_FILE | FH_REF_INLINE)); return handle->tab_width; } + +/* Returns the scratch file handle associated with HANDLE. + Applicable to only FH_REF_SCRATCH files. */ +struct scratch_handle * +fh_get_scratch_handle (struct file_handle *handle) +{ + assert (handle->referent == FH_REF_SCRATCH); + return handle->sh; +} + +/* Sets SH to be the scratch file handle associated with HANDLE. + Applicable to only FH_REF_SCRATCH files. */ +void +fh_set_scratch_handle (struct file_handle *handle, struct scratch_handle *sh) +{ + assert (handle->referent == FH_REF_SCRATCH); + handle->sh = sh; +} + +/* Returns the current default handle. */ +struct file_handle * +fh_get_default_handle (void) +{ + return default_handle ? default_handle : fh_inline_file (); +} + +/* Sets NEW_DEFAULT_HANDLE as the default handle. */ +void +fh_set_default_handle (struct file_handle *new_default_handle) +{ + assert (new_default_handle == NULL + || (new_default_handle->referent & (FH_REF_INLINE | FH_REF_FILE))); + default_handle = new_default_handle; +}