qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Make file_basename accessible and more usable

Browse source
This commit is contained in:
Bill Currie 2020-03-28 18:52:57 +09:00
parent 69037fe5eb
commit eacdd0d3de
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/qfcc.h
View file

@ -109,6 +109,7 @@ extern pr_info_t pr;
#define POINTER_OFS(s,p) ((pr_type_t *) (p) - (s)->data)
const char *strip_path (const char *filename) __attribute__((pure));
const char *file_basename (const char *filename, int keepdot) __attribute__((pure));
extern FILE *qc_yyin;
extern FILE *qp_yyin;

13
tools/qfcc/source/qfcc.c
View file

@ -313,8 +313,8 @@ strip_path (const char *filename)
return filename;
}
static const char *
file_basename (const char *filename)
const char *
file_basename (const char *filename, int keepdot)
{
const char *p;
const char *dot;
@ -325,7 +325,7 @@ file_basename (const char *filename)
for (dot = p = filename + strlen (filename); p > filename; p--) {
if (p[-1] == '/' || p[-1] == '\\')
break;
if (p[0] == '.')
if (!keepdot && p[0] == '.')
dot = p;
}
dstring_copysubstr (base, p, dot - p);
@ -395,7 +395,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
}
}
if (options.frames_files) {
write_frame_macros (va ("%s.frame", file_basename (file)));
write_frame_macros (va ("%s.frame", file_basename (file, 0)));
}
if (!err) {
qfo_t *qfo;
@ -753,13 +753,14 @@ progs_src_compile (void)
fprintf (single, "#include \"%s\"\n", qc_filename->str);
if (options.frames_files)
fprintf (single, "$frame_write \"%s.frame\"\n",
file_basename (qc_filename->str));
file_basename (qc_filename->str, 0));
} else {
if (compile_file (qc_filename->str))
return 1;
if (options.frames_files) {
write_frame_macros (va ("%s.frame",
file_basename (qc_filename->str)));
file_basename (qc_filename->str,
0)));
}
}
if (!Script_TokenAvailable (script, 0))

2
tools/qfcc/source/stub.c
View file

@ -53,3 +53,5 @@ int compare_protocols (protocollist_t *protos1, protocollist_t *protos2){return
void dump_dot (const char *stage, void *data,
void (*dump_func) (void *data, const char *fname)){}
void dump_dot_type (void *_t, const char *filename){}
const char *strip_path(const char *p) { return p;}
const char *file_basename(const char *p, int keepdot) { return p;}