X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffilename.h;h=e7df800caa405b13f49287a12637c70cceaf3002;hb=0e8ce9b60375ae15ddd8dafc27bad1cc26856b08;hp=3ad4d642b932e1376e4bbb9db20154bdef6dc113;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp diff --git a/src/data/filename.h b/src/data/filename.h index 3ad4d642b9..e7df800caa 100644 --- a/src/data/filename.h +++ b/src/data/filename.h @@ -36,7 +36,9 @@ extern const char *config_path; void fn_init (void); -char *fn_interp_vars (const char *input, const char *(*getenv) (const char *)); +struct string; +void fn_interp_vars (struct string *target, + const char *(*getenv) (const char *)); char *fn_tilde_expand (const char *fn); char *fn_search_path (const char *basename, const char *path, const char *prepend); @@ -63,26 +65,5 @@ struct file_identity *fn_get_identity (const char *filename); void fn_free_identity (struct file_identity *); int fn_compare_file_identities (const struct file_identity *, const struct file_identity *); - -/* Extended file routines. */ -struct file_ext; - -typedef int (*file_callback) (struct file_ext *); - -/* File callbacks may not return zero to indicate failure unless they - set errno to a sensible value. */ -struct file_ext - { - char *filename; /* Filename. */ - const char *mode; /* Open mode, i.e, "wb". */ - FILE *file; /* File. */ - int *sequence_no; /* Page number, etc. */ - void *param; /* User data. */ - file_callback postopen; /* Called after FILE opened. */ - file_callback preclose; /* Called before FILE closed. */ - }; - -int fn_open_ext (struct file_ext *file); -int fn_close_ext (struct file_ext *file); #endif /* filename_h */