/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#include <hashed_db.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.180 2012/12/08 22:17:22 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.186 2013/06/08 16:50:47 tom Exp $")
#define STDIN_NAME "<stdin>"
static FILE *
copy_input(FILE *source, const char *filename, char *alt_file)
{
+ char my_altfile[PATH_MAX];
FILE *result = 0;
- FILE *target = open_tempfile(alt_file);
+ FILE *target = 0;
int ch;
+ if (alt_file == 0)
+ alt_file = my_altfile;
+
if (source == 0) {
failed("copy_input (source)");
- } else if (target == 0) {
+ } else if ((target = open_tempfile(alt_file)) == 0) {
failed("copy_input (target)");
} else {
clearerr(source);
*/
result = fopen(alt_file, "r+");
fclose(target);
- to_remove = alt_file;
+ to_remove = strdup(alt_file);
}
return result;
}
return (code);
}
-static const char *
+static char *
valid_db_path(const char *nominal)
{
struct stat sb;
show_databases(const char *outdir)
{
bool specific = (outdir != 0) || getenv("TERMINFO") != 0;
- const char *result;
+ char *result;
const char *tried = 0;
if (outdir == 0) {
}
if ((result = valid_db_path(outdir)) != 0) {
printf("%s\n", result);
+ free(result);
} else {
tried = outdir;
}
if ((outdir = _nc_home_terminfo())) {
if ((result = valid_db_path(outdir)) != 0) {
printf("%s\n", result);
+ free(result);
} else if (!specific) {
tried = outdir;
}
static void
check_screen(TERMTYPE *tp)
{
+#if NCURSES_XNAMES
if (_nc_user_definable) {
int have_XT = tigetflag("XT");
int have_XM = tigetflag("XM");
_nc_warning("Expected XT to be set, given kmous");
}
}
+#endif
}
/*