You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "file-handle.h"
int open_cnt; /* 0=not open, otherwise # of openers. */
const char *type; /* If open, type of file. */
- const char *open_mode; /* "[rw][se]". */
+ char open_mode[3]; /* "[rw][se]". */
void *aux; /* Aux data pointer for owner if any. */
};
struct file_handle *iter;
for (iter = file_handles; iter != NULL; iter = iter->next)
- if (!strcmp (handle_name, iter->name))
+ if (!strcasecmp (handle_name, iter->name))
return iter;
return NULL;
}
int
cmd_file_handle (void)
{
- char handle_name[9];
+ char handle_name[LONG_NAME_LEN + 1];
struct cmd_file_handle cmd;
struct file_handle *handle;
if (!lex_force_id ())
return CMD_FAILURE;
- strcpy (handle_name, tokid);
+ st_trim_copy (handle_name, tokid, sizeof handle_name);
handle = get_handle_with_name (handle_name);
if (handle != NULL)
{
- msg (SE, _("File handle %s already refers to "
- "file %s. File handle cannot be redefined within a "
- "session."),
- tokid, handle->filename);
+ msg (SE, _("File handle %s already refers to file %s. "
+ "File handles cannot be redefined within a session."),
+ handle_name, handle->filename);
return CMD_FAILURE;
}
handle->tab_width = 4;
handle->open_cnt = 0;
handle->type = NULL;
- handle->open_mode = NULL;
handle->aux = NULL;
file_handles = handle;
modes the void * will necessarily be null only if no other
sharers are active.
- If successful, references to type and mode are retained, so
- they should probably be string literals. */
+ If successful, a reference to type is retained, so it should
+ probably be a string literal. */
void **
fh_open (struct file_handle *h, const char *type, const char *mode)
{
if (h->open_cnt != 0)
{
- if (strcmp (h->type, type))
- msg (SE, _("Can't open %s as a %s because it is "
- "already open as a %s"),
- handle_get_name (h), type, h->type);
- 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"),
- handle_get_name (h), type,
- mode_name (mode), mode_name (h->open_mode));
+ if (strcmp (h->type, type))
+ {
+ msg (SE, _("Can't open %s as a %s because it is "
+ "already open as a %s"),
+ handle_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"),
+ handle_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"),
- handle_get_name (h), type, mode_name (mode));
+ {
+ msg (SE, _("Can't re-open %s as a %s for %s"),
+ handle_get_name (h), type, mode_name (mode));
+ return NULL;
+ }
}
else
{
h->type = type;
- h->open_mode = mode;
+ strcpy (h->open_mode, mode);
assert (h->aux == NULL);
}
h->open_cnt++;
if (h->open_cnt == 0)
{
h->type = NULL;
- h->open_mode = NULL;
h->aux = NULL;
}
return h->open_cnt;
void
fh_done(void)
{
- assert(handle_list);
-
- ll_destroy(handle_list);
- handle_list = 0;
+ if ( handle_list )
+ {
+ ll_destroy(handle_list);
+ handle_list = 0;
+ }
}