Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10523

Modified Files: Tag: desiredata s_path.c m_pd.h Log Message: added open_via_path2

Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.58 retrieving revision 1.4.4.11.2.33.2.59 diff -C2 -d -r1.4.4.11.2.33.2.58 -r1.4.4.11.2.33.2.59 *** m_pd.h 19 Jul 2007 22:27:39 -0000 1.4.4.11.2.33.2.58 --- m_pd.h 19 Jul 2007 23:41:27 -0000 1.4.4.11.2.33.2.59 *************** *** 569,572 **** --- 569,574 ---- EXTERN int open_via_path(const char *name, const char *ext, const char *dir, char *dirresult, char **nameresult, unsigned int size, int bin); + EXTERN int open_via_path2(const char *dir, const char *name, const char *ext, char **dirresult, char **nameresult, int bin); + EXTERN int sched_geteventno(void); EXTERN double sys_getrealtime(void);

Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.6.2.8.2.10 retrieving revision 1.3.4.6.2.8.2.11 diff -C2 -d -r1.3.4.6.2.8.2.10 -r1.3.4.6.2.8.2.11 *** s_path.c 19 Jul 2007 21:08:46 -0000 1.3.4.6.2.8.2.10 --- s_path.c 19 Jul 2007 23:41:27 -0000 1.3.4.6.2.8.2.11 *************** *** 194,201 **** canvas-specific path. */

! static int do_open_via_path(const char *dir, const char *name, ! const char *ext, char **dirresult, char **nameresult, int bin, t_namelist *searchpath) ! { ! t_namelist *nl; int fd = -1; /* first check if "name" is absolute (and if so, try to open) */ --- 194,199 ---- canvas-specific path. */

! static int do_open_via_path( ! const char *dir, const char *name, const char *ext, char **dirresult, char **nameresult, int bin, t_namelist *searchpath) { int fd = -1; /* first check if "name" is absolute (and if so, try to open) */ *************** *** 204,208 **** if ((fd = sys_trytoopenone(dir, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next go through the search path */ ! for (nl = searchpath; nl; nl = nl->nl_next) if ((fd = sys_trytoopenone(nl->nl_string, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next look in "extra" */ --- 202,206 ---- if ((fd = sys_trytoopenone(dir, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next go through the search path */ ! for (t_namelist *nl=searchpath; nl; nl=nl->nl_next) if ((fd = sys_trytoopenone(nl->nl_string, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next look in "extra" */ *************** *** 214,217 **** --- 212,219 ---- }

+ extern "C" int open_via_path2(const char *dir, const char *name, const char *ext, char **dirresult, char **nameresult, int bin) { + return do_open_via_path(dir, name, ext, dirresult, nameresult, bin, sys_searchpath); + } + /* open via path, using the global search path. */ extern "C" int open_via_path(const char *dir, const char *name, const char *ext, *************** *** 227,231 **** extern "C" void open_via_helppath(const char *name, const char *dir) { char realname[MAXPDSTRING], *dirbuf, *basename; - /* make up a silly "dir" if none is supplied */ int fd; /* 1. "objectname-help.pd" */ --- 229,232 ---- *************** *** 248,254 **** }

- /* Startup file reading for linux and MACOSX. As of 0.38 this will be - deprecated in favor of the "settings" mechanism */ - extern "C" int sys_argparse(int argc, char **argv);

--- 249,252 ----