Pd-cvs May 2008

pd-cvs@lists.iem.at

16 participants
271 discussions

SF.net SVN: pure-data: [9798] trunk/packages/patches/ use_FILENAME_MAX_for_file_operations-0.41.4.patch
by eighthave＠users.sourceforge.net 14 May '08

14 May '08

Revision: 9798 http://pure-data.svn.sourceforge.net/pure-data/?rev=9798&view=rev Author: eighthave Date: 2008-05-14 10:38:40 -0700 (Wed, 14 May 2008) Log Message: ----------- oops, removed add_tilde_support_toopen-0.41.4.patch from this one Modified Paths: -------------- trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch Modified: trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch =================================================================== --- trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch 2008-05-14 17:37:20 UTC (rev 9797) +++ trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch 2008-05-14 17:38:40 UTC (rev 9798) @@ -241,61 +241,6 @@ =================================================================== --- s_path.c (revision 9725) +++ s_path.c (working copy) -@@ -22,6 +22,10 @@ - #include <io.h> - #endif - -+#ifdef MSW -+#include <windows.h> -+#endif -+ - #include <string.h> - #include "m_pd.h" - #include "m_imp.h" -@@ -69,6 +73,30 @@ - *to = 0; - } - -+/* expand env vars and ~ at the beginning of a path and make a copy to return */ -+static void sys_expandpath(const char *from, char *to) -+{ -+ if ((strlen(from) == 1 && from[0] == '~') || (strncmp(from,"~/", 2) == 0)) -+ { -+#ifdef MSW -+ const char *home = getenv("USERPROFILE"); -+#else -+ const char *home = getenv("HOME"); -+#endif -+ if(home) -+ { -+ strncpy(to, home, FILENAME_MAX - 1); -+ strncat(to, from + 1, FILENAME_MAX - strlen(from) - 2); -+ } -+ } -+ else -+ strncpy(to, from, FILENAME_MAX - 1); -+#ifdef MSW -+ char buf[FILENAME_MAX]; -+ ExpandEnvironmentStrings(to, buf, FILENAME_MAX - 2); -+ strncpy(to, buf, FILENAME_MAX - 1); -+#endif -+} - /******************* Utility functions used below ******************/ - - /*! -@@ -196,9 +224,11 @@ - char *dirresult, char **nameresult, unsigned int size, int bin) - { - int fd; -+ char buf[FILENAME_MAX]; - if (strlen(dir) + strlen(name) + strlen(ext) + 4 > size) - return (-1); -- strcpy(dirresult, dir); -+ sys_expandpath(dir, buf); -+ strcpy(dirresult, buf); - if (*dirresult && dirresult[strlen(dirresult)-1] != '/') - strcat(dirresult, "/"); - strcat(dirresult, name); @@ -250,16 +280,16 @@ int sys_open_absolute(const char *name, const char* ext, char *dirresult, char **nameresult, unsigned int size, int bin, int *fdp) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9797] trunk/packages/patches/ use_FILENAME_MAX_for_file_operations-0.41.4.patch
by eighthave＠users.sourceforge.net 14 May '08

14 May '08

Revision: 9797 http://pure-data.svn.sourceforge.net/pure-data/?rev=9797&view=rev Author: eighthave Date: 2008-05-14 10:37:20 -0700 (Wed, 14 May 2008) Log Message: ----------- patch #1963983 On Windows, FILENAME_MAX is much smaller than MAXPDSTRING, so I replaced MAXPDSTRING with FILENAME_MAX everywhere I could find that is related to filenames. FILENAME_MAX is a POSIX standard macro for defining the max length of a complete filename. The current situation could result in crashes on Windows. Added Paths: ----------- trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch Added: trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch =================================================================== --- trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch (rev 0) +++ trunk/packages/patches/use_FILENAME_MAX_for_file_operations-0.41.4.patch 2008-05-14 17:37:20 UTC (rev 9797) @@ -0,0 +1,645 @@ +Index: m_pd.h +=================================================================== +--- m_pd.h (revision 9725) ++++ m_pd.h (working copy) +@@ -51,7 +51,7 @@ + #include <stddef.h> /* just for size_t -- how lame! */ + #endif + +-#define MAXPDSTRING 1000 /* use this for anything you want */ ++#define MAXPDSTRING 1000 /* must be >= FILENAME_MAX */ + #define MAXPDARG 5 /* max number of args we can typecheck today */ + + /* signed and unsigned integer types the size of a pointer: */ +Index: g_editor.c +=================================================================== +--- g_editor.c (revision 9725) ++++ g_editor.c (working copy) +@@ -979,7 +979,7 @@ + "open," or "help." */ + static void canvas_done_popup(t_canvas *x, t_float which, t_float xpos, t_float ypos) + { +- char pathbuf[MAXPDSTRING], namebuf[MAXPDSTRING]; ++ char pathbuf[FILENAME_MAX], namebuf[FILENAME_MAX]; + t_gobj *y; + for (y = x->gl_list; y; y = y->g_next) + { +@@ -1011,7 +1011,7 @@ + t_atom *av = binbuf_getvec(ob->te_binbuf); + if (ac < 1) + return; +- atom_string(av, namebuf, MAXPDSTRING); ++ atom_string(av, namebuf, FILENAME_MAX); + dir = canvas_getdir((t_canvas *)y)->s_name; + } + else +Index: s_file.c +=================================================================== +--- s_file.c (revision 9725) ++++ s_file.c (working copy) +@@ -43,23 +43,23 @@ + + static void sys_initloadpreferences( void) + { +- char filenamebuf[MAXPDSTRING], *homedir = getenv("HOME"); ++ char filenamebuf[FILENAME_MAX], *homedir = getenv("HOME"); + int fd, length; +- char user_prefs_file[MAXPDSTRING]; /* user prefs file */ ++ char user_prefs_file[FILENAME_MAX]; /* user prefs file */ + /* default prefs embedded in the package */ +- char default_prefs_file[MAXPDSTRING]; ++ char default_prefs_file[FILENAME_MAX]; + struct stat statbuf; + +- snprintf(default_prefs_file, MAXPDSTRING, "%s/default.pdsettings", ++ snprintf(default_prefs_file, FILENAME_MAX, "%s/default.pdsettings", + sys_libdir->s_name); + if (homedir) +- snprintf(user_prefs_file, MAXPDSTRING, "%s/.pdsettings", homedir); ++ snprintf(user_prefs_file, FILENAME_MAX, "%s/.pdsettings", homedir); + if (stat(user_prefs_file, &statbuf) == 0) +- strncpy(filenamebuf, user_prefs_file, MAXPDSTRING); ++ strncpy(filenamebuf, user_prefs_file, FILENAME_MAX); + else if (stat(default_prefs_file, &statbuf) == 0) +- strncpy(filenamebuf, default_prefs_file, MAXPDSTRING); ++ strncpy(filenamebuf, default_prefs_file, FILENAME_MAX); + else return; +- filenamebuf[MAXPDSTRING-1] = 0; ++ filenamebuf[FILENAME_MAX-1] = 0; + if ((fd = open(filenamebuf, 0)) < 0) + { + if (sys_verbose) +@@ -128,17 +128,17 @@ + + static void sys_initsavepreferences( void) + { +- char filenamebuf[MAXPDSTRING], errbuf[MAXPDSTRING], ++ char filenamebuf[FILENAME_MAX], errbuf[FILENAME_MAX], + *homedir = getenv("HOME"); + FILE *fp; + + if (!homedir) + return; +- snprintf(filenamebuf, MAXPDSTRING, "%s/.pdsettings", homedir); +- filenamebuf[MAXPDSTRING-1] = 0; ++ snprintf(filenamebuf, FILENAME_MAX, "%s/.pdsettings", homedir); ++ filenamebuf[FILENAME_MAX-1] = 0; + if ((sys_prefsavefp = fopen(filenamebuf, "w")) == NULL) + { +- snprintf(errbuf, MAXPDSTRING, "%s: %s",filenamebuf, strerror(errno)); ++ snprintf(errbuf, FILENAME_MAX, "%s: %s",filenamebuf, strerror(errno)); + pd_error(0, errbuf); + } + } +@@ -228,15 +228,15 @@ + { + char cmdbuf[256]; + int nread = 0, nleft = size; +- char embedded_prefs[MAXPDSTRING]; +- char user_prefs[MAXPDSTRING]; ++ char embedded_prefs[FILENAME_MAX]; ++ char user_prefs[FILENAME_MAX]; + char *homedir = getenv("HOME"); + struct stat statbuf; + /* the 'defaults' command expects the filename without .plist at the + end */ +- snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", ++ snprintf(embedded_prefs, FILENAME_MAX, "%s/../org.puredata.pd", + sys_libdir->s_name); +- snprintf(user_prefs, MAXPDSTRING, ++ snprintf(user_prefs, FILENAME_MAX, + "%s/Library/Preferences/org.puredata.pd.plist", homedir); + if (stat(user_prefs, &statbuf) == 0) + snprintf(cmdbuf, 256, "defaults read org.puredata.pd %s 2> /dev/null\n", +Index: configure.in +=================================================================== +--- configure.in (revision 9725) ++++ configure.in (working copy) +@@ -347,11 +347,11 @@ + OSNUMBER=2 + if test x$jack = "xyes"; + then +- LDFLAGS=$LDFLAGS" -weak_framework Jack" ++ LDFLAGS=$LDFLAGS" -weak_framework Jackmp" + fi + if test x$jack = "xrun"; + then +- LDFLAGS=$LDFLAGS" -weak_framework Jack" ++ LDFLAGS=$LDFLAGS" -weak_framework Jackmp" + fi + fi + +Index: s_main.c +=================================================================== +--- s_main.c (revision 9725) ++++ s_main.c (working copy) +@@ -177,9 +177,9 @@ + + static void openit(const char *dirname, const char *filename) + { +- char dirbuf[MAXPDSTRING], *nameptr; ++ char dirbuf[FILENAME_MAX], *nameptr; + int fd = open_via_path(dirname, filename, "", dirbuf, &nameptr, +- MAXPDSTRING, 0); ++ FILENAME_MAX, 0); + if (fd >= 0) + { + close (fd); +@@ -430,7 +430,7 @@ + INSTALL_PREFIX. In MSW, we don't try to use INSTALL_PREFIX. */ + void sys_findprogdir(char *progname) + { +- char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp; ++ char sbuf[FILENAME_MAX], sbuf2[FILENAME_MAX], *sp; + char *lastslash; + #ifdef UNISTD + struct stat statbuf; +@@ -439,12 +439,12 @@ + /* find out by what string Pd was invoked; put answer in "sbuf". */ + #ifdef MSW + GetModuleFileName(NULL, sbuf2, sizeof(sbuf2)); +- sbuf2[MAXPDSTRING-1] = 0; ++ sbuf2[FILENAME_MAX-1] = 0; + sys_unbashfilename(sbuf2, sbuf); + #endif /* MSW */ + #ifdef UNISTD +- strncpy(sbuf, progname, MAXPDSTRING); +- sbuf[MAXPDSTRING-1] = 0; ++ strncpy(sbuf, progname, FILENAME_MAX); ++ sbuf[FILENAME_MAX-1] = 0; + #endif + lastslash = strrchr(sbuf, '/'); + if (lastslash) +@@ -491,16 +491,16 @@ + sys_libdir = gensym(sbuf2); + sys_guidir = &s_; /* in MSW the guipath just depends on the libdir */ + #else +- strncpy(sbuf, sbuf2, MAXPDSTRING-30); +- sbuf[MAXPDSTRING-30] = 0; ++ strncpy(sbuf, sbuf2, FILENAME_MAX-30); ++ sbuf[FILENAME_MAX-30] = 0; + strcat(sbuf, "/lib/pd"); + if (stat(sbuf, &statbuf) >= 0) + { + /* complicated layout: lib dir is the one we just stat-ed above */ + sys_libdir = gensym(sbuf); + /* gui lives in .../lib/pd/bin */ +- strncpy(sbuf, sbuf2, MAXPDSTRING-30); +- sbuf[MAXPDSTRING-30] = 0; ++ strncpy(sbuf, sbuf2, FILENAME_MAX-30); ++ sbuf[FILENAME_MAX-30] = 0; + strcat(sbuf, "/lib/pd/bin"); + sys_guidir = gensym(sbuf); + } +@@ -509,8 +509,8 @@ + /* simple layout: lib dir is the parent */ + sys_libdir = gensym(sbuf2); + /* gui lives in .../bin */ +- strncpy(sbuf, sbuf2, MAXPDSTRING-30); +- sbuf[MAXPDSTRING-30] = 0; ++ strncpy(sbuf, sbuf2, FILENAME_MAX-30); ++ sbuf[FILENAME_MAX-30] = 0; + strcat(sbuf, "/bin"); + sys_guidir = gensym(sbuf); + } +@@ -525,7 +525,6 @@ + + int sys_argparse(int argc, char **argv) + { +- char sbuf[MAXPDSTRING]; + int i; + while ((argc > 0) && **argv == '-') + { +@@ -901,7 +900,7 @@ + from command-line arguments */ + static void sys_afterargparse(void) + { +- char sbuf[MAXPDSTRING]; ++ char sbuf[FILENAME_MAX]; + int i; + int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; + int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; +@@ -909,13 +908,13 @@ + int nmidiindev = 0, midiindev[MAXMIDIINDEV]; + int nmidioutdev = 0, midioutdev[MAXMIDIOUTDEV]; + /* add "extra" library to path */ +- strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30); +- sbuf[MAXPDSTRING-30] = 0; ++ strncpy(sbuf, sys_libdir->s_name, FILENAME_MAX-30); ++ sbuf[FILENAME_MAX-30] = 0; + strcat(sbuf, "/extra"); + sys_setextrapath(sbuf); + /* add "doc/5.reference" library to helppath */ +- strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30); +- sbuf[MAXPDSTRING-30] = 0; ++ strncpy(sbuf, sys_libdir->s_name, FILENAME_MAX-30); ++ sbuf[FILENAME_MAX-30] = 0; + strcat(sbuf, "/doc/5.reference"); + sys_helppath = namelist_append_files(sys_helppath, sbuf); + /* correct to make audio and MIDI device lists zero based. On +Index: s_path.c +=================================================================== +--- s_path.c (revision 9725) ++++ s_path.c (working copy) +@@ -22,6 +22,10 @@ + #include <io.h> + #endif + ++#ifdef MSW ++#include <windows.h> ++#endif ++ + #include <string.h> + #include "m_pd.h" + #include "m_imp.h" +@@ -69,6 +73,30 @@ + *to = 0; + } + ++/* expand env vars and ~ at the beginning of a path and make a copy to return */ ++static void sys_expandpath(const char *from, char *to) ++{ ++ if ((strlen(from) == 1 && from[0] == '~') || (strncmp(from,"~/", 2) == 0)) ++ { ++#ifdef MSW ++ const char *home = getenv("USERPROFILE"); ++#else ++ const char *home = getenv("HOME"); ++#endif ++ if(home) ++ { ++ strncpy(to, home, FILENAME_MAX - 1); ++ strncat(to, from + 1, FILENAME_MAX - strlen(from) - 2); ++ } ++ } ++ else ++ strncpy(to, from, FILENAME_MAX - 1); ++#ifdef MSW ++ char buf[FILENAME_MAX]; ++ ExpandEnvironmentStrings(to, buf, FILENAME_MAX - 2); ++ strncpy(to, buf, FILENAME_MAX - 1); ++#endif ++} + /******************* Utility functions used below ******************/ + + /*! +@@ -196,9 +224,11 @@ + char *dirresult, char **nameresult, unsigned int size, int bin) + { + int fd; ++ char buf[FILENAME_MAX]; + if (strlen(dir) + strlen(name) + strlen(ext) + 4 > size) + return (-1); +- strcpy(dirresult, dir); ++ sys_expandpath(dir, buf); ++ strcpy(dirresult, buf); + if (*dirresult && dirresult[strlen(dirresult)-1] != '/') + strcat(dirresult, "/"); + strcat(dirresult, name); +@@ -250,16 +280,16 @@ + int sys_open_absolute(const char *name, const char* ext, + char *dirresult, char **nameresult, unsigned int size, int bin, int *fdp) + { +- if (name[0] == '/' ++ if (name[0] == '/' || name[0] == '~' + #ifdef MSW +- || (name[1] == ':' && name[2] == '/') ++ || name[0] == '%' || (name[1] == ':' && name[2] == '/') + #endif + ) + { +- char dirbuf[MAXPDSTRING]; ++ char dirbuf[FILENAME_MAX]; + int dirlen = (strrchr(name, '/') - name); +- if (dirlen > MAXPDSTRING-1) +- dirlen = MAXPDSTRING-1; ++ if (dirlen > FILENAME_MAX-1) ++ dirlen = FILENAME_MAX-1; + strncpy(dirbuf, name, dirlen); + dirbuf[dirlen] = 0; + *fdp = sys_trytoopenone(dirbuf, name+(dirlen+1), ext, +@@ -326,32 +356,32 @@ + search attempts. */ + void open_via_helppath(const char *name, const char *dir) + { +- char realname[MAXPDSTRING], dirbuf[MAXPDSTRING], *basename; ++ char realname[FILENAME_MAX], dirbuf[FILENAME_MAX], *basename; + /* make up a silly "dir" if none is supplied */ + const char *usedir = (*dir ? dir : "./"); + int fd; + + /* 1. "objectname-help.pd" */ +- strncpy(realname, name, MAXPDSTRING-10); +- realname[MAXPDSTRING-10] = 0; ++ strncpy(realname, name, FILENAME_MAX-10); ++ realname[FILENAME_MAX-10] = 0; + if (strlen(realname) > 3 && !strcmp(realname+strlen(realname)-3, ".pd")) + realname[strlen(realname)-3] = 0; + strcat(realname, "-help.pd"); + if ((fd = do_open_via_path(dir, realname, "", dirbuf, &basename, +- MAXPDSTRING, 0, sys_helppath)) >= 0) ++ FILENAME_MAX, 0, sys_helppath)) >= 0) + goto gotone; + + /* 2. "help-objectname.pd" */ + strcpy(realname, "help-"); +- strncat(realname, name, MAXPDSTRING-10); +- realname[MAXPDSTRING-1] = 0; ++ strncat(realname, name, FILENAME_MAX-10); ++ realname[FILENAME_MAX-1] = 0; + if ((fd = do_open_via_path(dir, realname, "", dirbuf, &basename, +- MAXPDSTRING, 0, sys_helppath)) >= 0) ++ FILENAME_MAX, 0, sys_helppath)) >= 0) + goto gotone; + + /* 3. "objectname.pd" */ + if ((fd = do_open_via_path(dir, name, "", dirbuf, &basename, +- MAXPDSTRING, 0, sys_helppath)) >= 0) ++ FILENAME_MAX, 0, sys_helppath)) >= 0) + goto gotone; + post("sorry, couldn't find help patch for \"%s\"", name); + return; +@@ -379,7 +409,7 @@ + int rcargc; + char* rcargv[NUMARGS]; + char* buffer; +- char fname[MAXPDSTRING], buf[1000], *home = getenv("HOME"); ++ char fname[FILENAME_MAX], buf[1000], *home = getenv("HOME"); + int retval = 1; /* that's what we will return at the end; for now, let's think it'll be an error */ + + /* initialize rc-arg-array so we can safely clean up at the end */ +@@ -391,7 +421,7 @@ + + *fname = '\0'; + +- strncat(fname, home? home : ".", MAXPDSTRING-10); ++ strncat(fname, home? home : ".", FILENAME_MAX-10); + strcat(fname, "/"); + + strcat(fname, STARTUPNAME); +Index: g_canvas.c +=================================================================== +--- g_canvas.c (revision 9725) ++++ g_canvas.c (working copy) +@@ -1543,7 +1543,6 @@ + { + t_namelist *nl, thislist; + int fd = -1; +- char listbuf[MAXPDSTRING]; + t_canvas *y; + + /* first check if "name" is absolute (and if so, try to open) */ +@@ -1563,12 +1562,12 @@ + dir = (x2 ? canvas_getdir(x2)->s_name : "."); + for (nl = y->gl_env->ce_path; nl; nl = nl->nl_next) + { +- char realname[MAXPDSTRING]; +- strncpy(realname, dir, MAXPDSTRING); +- realname[MAXPDSTRING-3] = 0; ++ char realname[FILENAME_MAX]; ++ strncpy(realname, dir, FILENAME_MAX); ++ realname[FILENAME_MAX-3] = 0; + strcat(realname, "/"); +- strncat(realname, nl->nl_string, MAXPDSTRING-strlen(realname)); +- realname[MAXPDSTRING-1] = 0; ++ strncat(realname, nl->nl_string, FILENAME_MAX-strlen(realname)); ++ realname[FILENAME_MAX-1] = 0; + if ((fd = sys_trytoopenone(realname, name, ext, + dirresult, nameresult, size, bin)) >= 0) + return (fd); +Index: s_loader.c +=================================================================== +--- s_loader.c (revision 9725) ++++ s_loader.c (working copy) +@@ -86,7 +86,7 @@ + + static int sys_do_load_lib(t_canvas *canvas, char *objectname) + { +- char symname[MAXPDSTRING], filename[MAXPDSTRING], dirbuf[MAXPDSTRING], ++ char symname[MAXPDSTRING], filename[FILENAME_MAX], dirbuf[FILENAME_MAX], + *classname, *nameptr, altsymname[MAXPDSTRING]; + void *dlobj; + t_xxx makeout = NULL; +@@ -137,23 +137,23 @@ + #endif + /* try looking in the path for (objectname).(sys_dllextent) ... */ + if ((fd = canvas_open(canvas, objectname, sys_dllextent, +- dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ++ dirbuf, &nameptr, FILENAME_MAX, 1)) >= 0) + goto gotone; + /* same, with the more generic sys_dllextent2 */ + if ((fd = canvas_open(canvas, objectname, sys_dllextent2, +- dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ++ dirbuf, &nameptr, FILENAME_MAX, 1)) >= 0) + goto gotone; + /* next try (objectname)/(classname).(sys_dllextent) ... */ +- strncpy(filename, objectname, MAXPDSTRING); ++ strncpy(filename, objectname, FILENAME_MAX); + filename[MAXPDSTRING-2] = 0; + strcat(filename, "/"); +- strncat(filename, classname, MAXPDSTRING-strlen(filename)); +- filename[MAXPDSTRING-1] = 0; ++ strncat(filename, classname, FILENAME_MAX-strlen(filename)); ++ filename[FILENAME_MAX-1] = 0; + if ((fd = canvas_open(canvas, filename, sys_dllextent, +- dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ++ dirbuf, &nameptr, FILENAME_MAX, 1)) >= 0) + goto gotone; + if ((fd = canvas_open(canvas, filename, sys_dllextent2, +- dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ++ dirbuf, &nameptr, FILENAME_MAX, 1)) >= 0) + goto gotone; + return (0); + gotone: +@@ -161,11 +161,11 @@ + class_set_extern_dir(gensym(dirbuf)); + + /* rebuild the absolute pathname */ +- strncpy(filename, dirbuf, MAXPDSTRING); +- filename[MAXPDSTRING-2] = 0; ++ strncpy(filename, dirbuf, FILENAME_MAX); ++ filename[FILENAME_MAX-2] = 0; + strcat(filename, "/"); +- strncat(filename, nameptr, MAXPDSTRING-strlen(filename)); +- filename[MAXPDSTRING-1] = 0; ++ strncat(filename, nameptr, FILENAME_MAX-strlen(filename)); ++ filename[FILENAME_MAX-1] = 0; + + #ifdef DL_OPEN + dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); +Index: m_binbuf.c +=================================================================== +--- m_binbuf.c (revision 9725) ++++ m_binbuf.c (working copy) +@@ -740,7 +740,7 @@ + + static int binbuf_doopen(char *s, int mode) + { +- char namebuf[MAXPDSTRING]; ++ char namebuf[FILENAME_MAX]; + #ifdef MSW + mode |= O_BINARY; + #endif +@@ -750,7 +750,7 @@ + + static FILE *binbuf_dofopen(char *s, char *mode) + { +- char namebuf[MAXPDSTRING]; ++ char namebuf[FILENAME_MAX]; + sys_bashfilename(s, namebuf); + return (fopen(namebuf, mode)); + } +@@ -761,7 +761,7 @@ + int fd; + int readret; + char *buf; +- char namebuf[MAXPDSTRING]; ++ char namebuf[FILENAME_MAX]; + + namebuf[0] = 0; + if (*dirname) +@@ -814,9 +814,9 @@ + int crflag) + { + int filedesc; +- char buf[MAXPDSTRING], *bufptr; ++ char buf[FILENAME_MAX], *bufptr; + if ((filedesc = canvas_open(canvas, filename, "", +- buf, &bufptr, MAXPDSTRING, 0)) < 0) ++ buf, &bufptr, FILENAME_MAX, 0)) < 0) + { + error("%s: can't open", filename); + return (1); +@@ -832,9 +832,9 @@ + int crflag) + { + int filedesc; +- char buf[MAXPDSTRING], *bufptr; ++ char buf[FILENAME_MAX], *bufptr; + if ((filedesc = open_via_path( +- dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0)) < 0) ++ dirname, filename, "", buf, &bufptr, FILENAME_MAX, 0)) < 0) + { + error("%s: can't open", filename); + return (1); +@@ -853,7 +853,7 @@ + int binbuf_write(t_binbuf *x, char *filename, char *dir, int crflag) + { + FILE *f = 0; +- char sbuf[WBUFSIZE], fbuf[MAXPDSTRING], *bp = sbuf, *ep = sbuf + WBUFSIZE; ++ char sbuf[WBUFSIZE], fbuf[FILENAME_MAX], *bp = sbuf, *ep = sbuf + WBUFSIZE; + t_atom *ap; + int indx, deleteit = 0; + int ncolumn = 0; +Index: d_soundfile.c +=================================================================== +--- d_soundfile.c (revision 9725) ++++ d_soundfile.c (working copy) +@@ -400,9 +400,9 @@ + int *p_bytespersamp, int *p_bigendian, int *p_nchannels, long *p_bytelimit, + long skipframes) + { +- char buf[OBUFSIZE], *bufptr; ++ char buf[FILENAME_MAX], *bufptr; + int fd; +- fd = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 1); ++ fd = open_via_path(dirname, filename, "", buf, &bufptr, FILENAME_MAX, 1); + if (fd < 0) + return (-1); + else return (open_soundfile_via_fd(fd, headersize, p_bytespersamp, +@@ -416,9 +416,9 @@ + int *p_bytespersamp, int *p_bigendian, int *p_nchannels, long *p_bytelimit, + long skipframes) + { +- char buf[OBUFSIZE], *bufptr; ++ char buf[FILENAME_MAX], *bufptr; + int fd; +- fd = canvas_open(canvas, filename, "", buf, &bufptr, MAXPDSTRING, 1); ++ fd = canvas_open(canvas, filename, "", buf, &bufptr, FILENAME_MAX, 1); + if (fd < 0) + return (-1); + else return (open_soundfile_via_fd(fd, headersize, p_bytespersamp, +@@ -738,15 +738,15 @@ + int filetype, int nframes, int bytespersamp, + int bigendian, int nchannels, int swap, t_float samplerate) + { +- char filenamebuf[MAXPDSTRING], buf2[MAXPDSTRING]; ++ char filenamebuf[FILENAME_MAX], buf2[FILENAME_MAX]; + char headerbuf[WRITEHDRSIZE]; + t_wave *wavehdr = (t_wave *)headerbuf; + t_nextstep *nexthdr = (t_nextstep *)headerbuf; + t_aiff *aiffhdr = (t_aiff *)headerbuf; + int fd, headersize = 0; + +- strncpy(filenamebuf, filename, MAXPDSTRING-10); +- filenamebuf[MAXPDSTRING-10] = 0; ++ strncpy(filenamebuf, filename, FILENAME_MAX-10); ++ filenamebuf[FILENAME_MAX-10] = 0; + + if (filetype == FORMAT_NEXT) + { +@@ -812,7 +812,7 @@ + headersize = sizeof(t_wave); + } + +- canvas_makefilename(canvas, filenamebuf, buf2, MAXPDSTRING); ++ canvas_makefilename(canvas, filenamebuf, buf2, FILENAME_MAX); + sys_bashfilename(buf2, buf2); + if ((fd = open(buf2, BINCREATE, 0666)) < 0) + return (-1); +Index: m_class.c +=================================================================== +--- m_class.c (revision 9725) ++++ m_class.c (working copy) +@@ -498,7 +498,7 @@ + + static t_symbol *addfileextent(t_symbol *s) + { +- char namebuf[MAXPDSTRING], *str = s->s_name; ++ char namebuf[FILENAME_MAX], *str = s->s_name; + int ln = strlen(str); + if (!strcmp(str + ln - 3, ".pd")) return (s); + strcpy(namebuf, str); +@@ -520,7 +520,7 @@ + { + t_pd *current; + int fd; +- char dirbuf[MAXPDSTRING], *nameptr; ++ char dirbuf[FILENAME_MAX], *nameptr; + if (tryingalready) return; + newest = 0; + class_loadsym = s; +@@ -534,9 +534,9 @@ + class_loadsym = 0; + current = s__X.s_thing; + if ((fd = canvas_open(canvas_getcurrent(), s->s_name, ".pd", +- dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0 || ++ dirbuf, &nameptr, FILENAME_MAX, 0)) >= 0 || + (fd = canvas_open(canvas_getcurrent(), s->s_name, ".pat", +- dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0) ++ dirbuf, &nameptr, FILENAME_MAX, 0)) >= 0) + { + close (fd); + if (!pd_setloadingabstraction(s)) +Index: g_array.c +=================================================================== +--- g_array.c (revision 9725) ++++ g_array.c (working copy) +@@ -1384,7 +1384,7 @@ + { + int nelem, filedesc, i; + FILE *fd; +- char buf[MAXPDSTRING], *bufptr; ++ char buf[FILENAME_MAX], *bufptr; + int yonset, elemsize; + t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize); + if (!array) +@@ -1394,7 +1394,7 @@ + } + nelem = array->a_n; + if ((filedesc = canvas_open(glist_getcanvas(x->x_glist), +- filename->s_name, "", buf, &bufptr, MAXPDSTRING, 0)) < 0 ++ filename->s_name, "", buf, &bufptr, FILENAME_MAX, 0)) < 0 + || !(fd = fdopen(filedesc, "r"))) + { + error("%s: can't open", filename->s_name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9796] trunk/packages/patches/ add_tilde_support_toopen-0.41.4.patch
by eighthave＠users.sourceforge.net 14 May '08

14 May '08

Revision: 9796 http://pure-data.svn.sourceforge.net/pure-data/?rev=9796&view=rev Author: eighthave Date: 2008-05-14 10:25:26 -0700 (Wed, 14 May 2008) Log Message: ----------- updated to fix crasher bug on GNU/Linux Modified Paths: -------------- trunk/packages/patches/add_tilde_support_toopen-0.41.4.patch Modified: trunk/packages/patches/add_tilde_support_toopen-0.41.4.patch =================================================================== --- trunk/packages/patches/add_tilde_support_toopen-0.41.4.patch 2008-05-14 13:48:18 UTC (rev 9795) +++ trunk/packages/patches/add_tilde_support_toopen-0.41.4.patch 2008-05-14 17:25:26 UTC (rev 9796) @@ -1,8 +1,8 @@ Index: s_path.c =================================================================== ---- s_path.c (revision 9773) +--- s_path.c (revision 9725) +++ s_path.c (working copy) -@@ -30,6 +30,10 @@ +@@ -22,6 +22,10 @@ #include <io.h> #endif @@ -13,7 +13,7 @@ #include <string.h> #include "m_pd.h" #include "m_imp.h" -@@ -70,6 +70,30 @@ +@@ -69,6 +73,30 @@ *to = 0; } @@ -44,16 +44,20 @@ /******************* Utility functions used below ******************/ /*! -@@ -199,7 +223,7 @@ +@@ -196,9 +224,11 @@ + char *dirresult, char **nameresult, unsigned int size, int bin) + { int fd; ++ char buf[FILENAME_MAX]; if (strlen(dir) + strlen(name) + strlen(ext) + 4 > size) return (-1); - strcpy(dirresult, dir); -+ sys_expandpath(dir, dirresult); ++ sys_expandpath(dir, buf); ++ strcpy(dirresult, buf); if (*dirresult && dirresult[strlen(dirresult)-1] != '/') strcat(dirresult, "/"); strcat(dirresult, name); -@@ -251,9 +275,9 @@ +@@ -250,9 +280,9 @@ int sys_open_absolute(const char *name, const char* ext, char *dirresult, char **nameresult, unsigned int size, int bin, int *fdp) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9795] branches/pd-extended/v0-40/pd/src/u_main.tk
by eighthave＠users.sourceforge.net 14 May '08

14 May '08

Revision: 9795 http://pure-data.svn.sourceforge.net/pure-data/?rev=9795&view=rev Author: eighthave Date: 2008-05-14 06:48:18 -0700 (Wed, 14 May 2008) Log Message: ----------- restored Ctrl-click to click in edit more, I mistakenly turned it into right-click, which is not useful on GNU/Linux and Windows Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/u_main.tk Modified: branches/pd-extended/v0-40/pd/src/u_main.tk =================================================================== --- branches/pd-extended/v0-40/pd/src/u_main.tk 2008-05-13 17:28:34 UTC (rev 9794) +++ branches/pd-extended/v0-40/pd/src/u_main.tk 2008-05-14 13:48:18 UTC (rev 9795) @@ -1489,7 +1489,7 @@ bind $name.c <Control-Button> {pdtk_canvas_rightclick %W %x %y %b} } else { bind $name.c <Button-3> {pdtk_canvas_rightclick %W %x %y %b} - bind $name.c <Control-Button> {pdtk_canvas_rightclick %W %x %y %b} + bind $name.c <Control-Button> {pdtk_canvas_click %W %x %y %b 2} } #on linux, button 2 "pastes" from the X windows clipboard if {$pd_nt == 0} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9794] trunk/packages/linux_make/pd-extended.desktop
by eighthave＠users.sourceforge.net 13 May '08

13 May '08

Revision: 9794 http://pure-data.svn.sourceforge.net/pure-data/?rev=9794&view=rev Author: eighthave Date: 2008-05-13 10:28:34 -0700 (Tue, 13 May 2008) Log Message: ----------- changed to reflect path change from /usr/local to /usr Modified Paths: -------------- trunk/packages/linux_make/pd-extended.desktop Modified: trunk/packages/linux_make/pd-extended.desktop =================================================================== --- trunk/packages/linux_make/pd-extended.desktop 2008-05-12 23:20:21 UTC (rev 9793) +++ trunk/packages/linux_make/pd-extended.desktop 2008-05-13 17:28:34 UTC (rev 9794) @@ -9,7 +9,7 @@ Comment[fr]=Plateforme de programmation visuelle pour applications multim\x8Edia Comment[it]=Piattaforma di programmazione visuale per applicazioni multimedia Comment[pt]=Plataforma de programa\x8D\x8Bo visuais para multimedia -Exec=/usr/local/bin/pd %F +Exec=/usr/bin/pd %F Terminal=false Type=Application Icon=pd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9793] trunk/packages/patches/ default_and_embedded_plist-0.41.4.patch
by eighthave＠users.sourceforge.net 13 May '08

13 May '08

Revision: 9793 http://pure-data.svn.sourceforge.net/pure-data/?rev=9793&view=rev Author: eighthave Date: 2008-05-12 16:20:21 -0700 (Mon, 12 May 2008) Log Message: ----------- patch #1962700 two embedded prefs for Mac: default and override all Added Paths: ----------- trunk/packages/patches/default_and_embedded_plist-0.41.4.patch Added: trunk/packages/patches/default_and_embedded_plist-0.41.4.patch =================================================================== --- trunk/packages/patches/default_and_embedded_plist-0.41.4.patch (rev 0) +++ trunk/packages/patches/default_and_embedded_plist-0.41.4.patch 2008-05-12 23:20:21 UTC (rev 9793) @@ -0,0 +1,50 @@ +Index: s_file.c +=================================================================== +--- s_file.c (revision 9789) ++++ s_file.c (working copy) +@@ -235,17 +235,35 @@ + { + char cmdbuf[256]; + int nread = 0, nleft = size; +- char embedded_prefs[MAXPDSTRING]; +- char user_prefs[MAXPDSTRING]; +- char *homedir = getenv("HOME"); ++ char default_prefs[MAXPDSTRING]; // default prefs embedded in the package ++ char embedded_prefs[MAXPDSTRING]; // overrides others for standalone app ++ char embedded_prefs_file[MAXPDSTRING]; ++ char user_prefs_file[MAXPDSTRING]; ++ char *homedir = getenv("HOME"); + struct stat statbuf; +- /* the 'defaults' command expects the filename without .plist at the end */ +- snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", sys_libdir->s_name); +- snprintf(user_prefs, MAXPDSTRING, "%s/Library/Preferences/org.puredata.pd.plist", homedir); +- if (stat(user_prefs, &statbuf) == 0) +- snprintf(cmdbuf, 256, "defaults read org.puredata.pd %s 2> /dev/null\n", key); +- else +- snprintf(cmdbuf, 256, "defaults read %s %s 2> /dev/null\n", embedded_prefs, key); ++ /* the 'defaults' command expects the filename without .plist at the end */ ++ snprintf(default_prefs, MAXPDSTRING, "%s/../org.puredata.pd.default", ++ sys_libdir->s_name); ++ snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", ++ sys_libdir->s_name); ++ snprintf(embedded_prefs_file, MAXPDSTRING, "%s.plist", embedded_prefs); ++ snprintf(user_prefs_file, MAXPDSTRING, ++ "%s/Library/Preferences/org.puredata.pd.plist", homedir); ++ if (stat(embedded_prefs_file, &statbuf) == 0) ++ { ++ snprintf(cmdbuf, 256, ++ "defaults read %s %s 2> /dev/null\n", embedded_prefs, key); ++ } ++ else if (stat(user_prefs_file, &statbuf) == 0) ++ { ++ snprintf(cmdbuf, 256, ++ "defaults read org.puredata.pd %s 2> /dev/null\n", key); ++ } ++ else ++ { ++ snprintf(cmdbuf, 256, ++ "defaults read %s %s 2> /dev/null\n", default_prefs, key); ++ } + FILE *fp = popen(cmdbuf, "r"); + while (nread < size) + { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9792] trunk/packages/darwin_app
by eighthave＠users.sourceforge.net 13 May '08

13 May '08

Revision: 9792 http://pure-data.svn.sourceforge.net/pure-data/?rev=9792&view=rev Author: eighthave Date: 2008-05-12 16:18:29 -0700 (Mon, 12 May 2008) Log Message: ----------- (Ported from Pd-extended 0.39.3) created two different kinds of embedded org.puredata.pd.plist prefs files on Mac OS X. The first is the default settings that come with Pd-extended.app, the second is a prefs file that overrides all others, so that people can make their own custom apps based on the Pd.app, and be sure that the user's prefs aren't going to override things. Modified Paths: -------------- trunk/packages/darwin_app/Makefile trunk/packages/darwin_app/TODO Added Paths: ----------- trunk/packages/darwin_app/org.puredata.pd.default.plist Removed Paths: ------------- trunk/packages/darwin_app/org.puredata.pd.plist Modified: trunk/packages/darwin_app/Makefile =================================================================== --- trunk/packages/darwin_app/Makefile 2008-05-12 23:16:49 UTC (rev 9791) +++ trunk/packages/darwin_app/Makefile 2008-05-12 23:18:29 UTC (rev 9792) @@ -199,7 +199,7 @@ ln -s ../bin/pd.tk AppMain.tcl # support for Info Panel Plugins mgmt cd "$(PD_APP_CONTENTS)" && ln -s Resources/extra Plugins - install -p -m0666 org.puredata.pd.plist "$(PD_APP_CONTENTS)/" + install -p -m0644 org.puredata.pd.default.plist "$(PD_APP_CONTENTS)/" #------------------------------------------------------------------------------# Modified: trunk/packages/darwin_app/TODO =================================================================== --- trunk/packages/darwin_app/TODO 2008-05-12 23:16:49 UTC (rev 9791) +++ trunk/packages/darwin_app/TODO 2008-05-12 23:18:29 UTC (rev 9792) @@ -2,24 +2,6 @@ - check code to make it all use single-precision/libmx functions on Mac OSX. - -- create background image for .dmg - - -- fix app permissions so that you can drop a new app on top of an old one to - upgrade - - -- make sure that org.puredata.pd.plist is rw in the .dmg (possible?) - - -- check out using TclTkBI package for all of the tcl deps. It should have all - of the binaries necessary for extensions/gui/ix - - - research Tcl "auto_path" - - - according to tigital, not all of the gui/ix deps are ported to Aqua... - - review permissions so that you can build on top on existing builds (its the Frameworks, just chmod -R +w after installingx) @@ -43,12 +25,6 @@ - fix edit mode menu item (make it a checkbox or change to "play mode" -- redo key mapping system - - make Cmd-Delete also delete, as well as just Delete, so that my - Finder key command habits work in Pd as well - - make Cmd-click work like Ctrl-click - - - Pd should then test to see if Jack is available before switching to it, otherwise it'll just crash. Here's apple's method of testing: Copied: trunk/packages/darwin_app/org.puredata.pd.default.plist (from rev 9789, trunk/packages/darwin_app/org.puredata.pd.plist) =================================================================== --- trunk/packages/darwin_app/org.puredata.pd.default.plist (rev 0) +++ trunk/packages/darwin_app/org.puredata.pd.default.plist 2008-05-12 23:18:29 UTC (rev 9792) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>defeatrt</key> + <string>0</string> + <key>flags</key> + <string>-helppath /Library/Pd</string> + <key>loadlib1</key> + <string>libdir</string> + <key>loadlib2</key> + <string>Gem</string> + <key>loadlib3</key> + <string>cyclone</string> + <key>loadlib4</key> + <string>zexy</string> + <key>loadlib5</key> + <string>creb</string> + <key>loadlib6</key> + <string>cxc</string> + <key>loadlib7</key> + <string>iemlib</string> + <key>loadlib8</key> + <string>list-abs</string> + <key>loadlib9</key> + <string>mapping</string> + <key>loadlib10</key> + <string>markex</string> + <key>loadlib11</key> + <string>maxlib</string> + <key>loadlib12</key> + <string>memento</string> + <key>loadlib13</key> + <string>mjlib</string> + <key>loadlib14</key> + <string>motex</string> + <key>loadlib15</key> + <string>oscx</string> + <key>loadlib16</key> + <string>pddp</string> + <key>loadlib17</key> + <string>pdogg</string> + <key>loadlib18</key> + <string>pixeltango</string> + <key>loadlib19</key> + <string>pmpd</string> + <key>loadlib20</key> + <string>rradical</string> + <key>loadlib21</key> + <string>sigpack</string> + <key>loadlib22</key> + <string>smlib</string> + <key>loadlib23</key> + <string>toxy</string> + <key>loadlib24</key> + <string>unauthorized</string> + <key>loadlib25</key> + <string>vbap</string> + <key>loadlib26</key> + <string>pan</string> + <key>loadlib27</key> + <string>freeverb</string> + <key>loadlib28</key> + <string>hcs</string> + <key>loadlib29</key> + <string>jmmmp</string> + <key>loadlib30</key> + <string>ext13</string> + <key>loadlib31</key> + <string>hardware</string> + <key>loadlib32</key> + <string>ggee</string> + <key>loadlib33</key> + <string>iem_anything</string> + <key>loadlib34</key> + <string>flib</string> + <key>loadlib35</key> + <string>ekext</string> + <key>loadlib36</key> + <string>flatspace</string> + <key>loadlib37</key> + <string>deprecated</string> + <key>loadlib38</key> + <string>pdp</string> + <key>loadlib39</key> + <string>pidip</string> + <key>path1</key> + <string>/Library/Pd</string> + <key>path2</key> + <string>/System/Library/Fonts</string> + <key>path3</key> + <string>/Library/Fonts</string> + <key>path4</key> + <string>~/Library/Fonts</string> + <key>path5</key> + <string>/usr/X11R6/lib/X11/fonts/TTF</string> + <key>path6</key> + <string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string> + <key>path7</key> + <string>/sw/lib/X11/fonts/msttf</string> + <key>path8</key> + <string>/sw/lib/X11/fonts/intl/TrueType</string> + <key>path9</key> + <string>/sw/lib/X11/fonts/applettf</string> +</dict> + </plist> + Deleted: trunk/packages/darwin_app/org.puredata.pd.plist =================================================================== --- trunk/packages/darwin_app/org.puredata.pd.plist 2008-05-12 23:16:49 UTC (rev 9791) +++ trunk/packages/darwin_app/org.puredata.pd.plist 2008-05-12 23:18:29 UTC (rev 9792) @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>defeatrt</key> - <string>0</string> - <key>flags</key> - <string>-helppath /Library/Pd</string> - <key>loadlib1</key> - <string>libdir</string> - <key>loadlib2</key> - <string>Gem</string> - <key>loadlib3</key> - <string>cyclone</string> - <key>loadlib4</key> - <string>zexy</string> - <key>loadlib5</key> - <string>creb</string> - <key>loadlib6</key> - <string>cxc</string> - <key>loadlib7</key> - <string>iemlib</string> - <key>loadlib8</key> - <string>list-abs</string> - <key>loadlib9</key> - <string>mapping</string> - <key>loadlib10</key> - <string>markex</string> - <key>loadlib11</key> - <string>maxlib</string> - <key>loadlib12</key> - <string>memento</string> - <key>loadlib13</key> - <string>mjlib</string> - <key>loadlib14</key> - <string>motex</string> - <key>loadlib15</key> - <string>oscx</string> - <key>loadlib16</key> - <string>pddp</string> - <key>loadlib17</key> - <string>pdogg</string> - <key>loadlib18</key> - <string>pixeltango</string> - <key>loadlib19</key> - <string>pmpd</string> - <key>loadlib20</key> - <string>rradical</string> - <key>loadlib21</key> - <string>sigpack</string> - <key>loadlib22</key> - <string>smlib</string> - <key>loadlib23</key> - <string>toxy</string> - <key>loadlib24</key> - <string>unauthorized</string> - <key>loadlib25</key> - <string>vbap</string> - <key>loadlib26</key> - <string>pan</string> - <key>loadlib27</key> - <string>freeverb</string> - <key>loadlib28</key> - <string>hcs</string> - <key>loadlib29</key> - <string>jmmmp</string> - <key>loadlib30</key> - <string>ext13</string> - <key>loadlib31</key> - <string>hardware</string> - <key>loadlib32</key> - <string>ggee</string> - <key>loadlib33</key> - <string>iem_anything</string> - <key>loadlib34</key> - <string>flib</string> - <key>loadlib35</key> - <string>ekext</string> - <key>loadlib36</key> - <string>flatspace</string> - <key>loadlib37</key> - <string>deprecated</string> - <key>loadlib38</key> - <string>pdp</string> - <key>loadlib39</key> - <string>pidip</string> - <key>path1</key> - <string>/Library/Pd</string> - <key>path2</key> - <string>/System/Library/Fonts</string> - <key>path3</key> - <string>/Library/Fonts</string> - <key>path4</key> - <string>~/Library/Fonts</string> - <key>path5</key> - <string>/usr/X11R6/lib/X11/fonts/TTF</string> - <key>path6</key> - <string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string> - <key>path7</key> - <string>/sw/lib/X11/fonts/msttf</string> - <key>path8</key> - <string>/sw/lib/X11/fonts/intl/TrueType</string> - <key>path9</key> - <string>/sw/lib/X11/fonts/applettf</string> -</dict> - </plist> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9791] trunk/scripts/generate-pd-settings-files.sh
by eighthave＠users.sourceforge.net 13 May '08

13 May '08

Revision: 9791 http://pure-data.svn.sourceforge.net/pure-data/?rev=9791&view=rev Author: eighthave Date: 2008-05-12 16:16:49 -0700 (Mon, 12 May 2008) Log Message: ----------- added ~ locations for Mac and Linux; changed name of default settings files Modified Paths: -------------- trunk/scripts/generate-pd-settings-files.sh Modified: trunk/scripts/generate-pd-settings-files.sh =================================================================== --- trunk/scripts/generate-pd-settings-files.sh 2008-05-12 23:13:42 UTC (rev 9790) +++ trunk/scripts/generate-pd-settings-files.sh 2008-05-12 23:16:49 UTC (rev 9791) @@ -2,8 +2,8 @@ LIBS="libdir Gem cyclone zexy creb cxc iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 hardware ggee iem_anything flib ekext flatspace deprecated pdp pidip" -GNULINUX_FONTPATH="/usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" -MACOSX_FONTPATH="/Library/Pd /System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf" +GNULINUX_FONTPATH="~/pd /usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" +MACOSX_FONTPATH="~/Library/Pd /Library/Pd /System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf" # TODO this needs to be changed to add to a user dir like %USERPROFILE% (like /Library/Pd) WINDOWS_FONTPATH="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00" @@ -11,7 +11,7 @@ ROOT_DIR=${SCRIPT_DIR}/../packages GNULINUX_FILE=${ROOT_DIR}/linux_make/default.pdsettings -MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist +MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.default.plist WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno.registry.reg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9790] branches/pd-extended/v0-40/pd/src/s_file.c
by eighthave＠users.sourceforge.net 13 May '08

13 May '08

Revision: 9790 http://pure-data.svn.sourceforge.net/pure-data/?rev=9790&view=rev Author: eighthave Date: 2008-05-12 16:13:42 -0700 (Mon, 12 May 2008) Log Message: ----------- ported embedded overriding preferences from Pd-extended 0.39.3 and preped as patch against 0.41-4 Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/s_file.c Modified: branches/pd-extended/v0-40/pd/src/s_file.c =================================================================== --- branches/pd-extended/v0-40/pd/src/s_file.c 2008-05-12 22:27:41 UTC (rev 9789) +++ branches/pd-extended/v0-40/pd/src/s_file.c 2008-05-12 23:13:42 UTC (rev 9790) @@ -235,17 +235,35 @@ { char cmdbuf[256]; int nread = 0, nleft = size; - char embedded_prefs[MAXPDSTRING]; - char user_prefs[MAXPDSTRING]; - char *homedir = getenv("HOME"); + char default_prefs[MAXPDSTRING]; // default prefs embedded in the package + char embedded_prefs[MAXPDSTRING]; // overrides others for standalone app + char embedded_prefs_file[MAXPDSTRING]; + char user_prefs_file[MAXPDSTRING]; + char *homedir = getenv("HOME"); struct stat statbuf; - /* the 'defaults' command expects the filename without .plist at the end */ - snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", sys_libdir->s_name); - snprintf(user_prefs, MAXPDSTRING, "%s/Library/Preferences/org.puredata.pd.plist", homedir); - if (stat(user_prefs, &statbuf) == 0) - snprintf(cmdbuf, 256, "defaults read org.puredata.pd %s 2> /dev/null\n", key); - else - snprintf(cmdbuf, 256, "defaults read %s %s 2> /dev/null\n", embedded_prefs, key); + /* the 'defaults' command expects the filename without .plist at the end */ + snprintf(default_prefs, MAXPDSTRING, "%s/../org.puredata.pd.default", + sys_libdir->s_name); + snprintf(embedded_prefs, MAXPDSTRING, "%s/../org.puredata.pd", + sys_libdir->s_name); + snprintf(embedded_prefs_file, MAXPDSTRING, "%s.plist", embedded_prefs); + snprintf(user_prefs_file, MAXPDSTRING, + "%s/Library/Preferences/org.puredata.pd.plist", homedir); + if (stat(embedded_prefs_file, &statbuf) == 0) + { + snprintf(cmdbuf, 256, + "defaults read %s %s 2> /dev/null\n", embedded_prefs, key); + } + else if (stat(user_prefs_file, &statbuf) == 0) + { + snprintf(cmdbuf, 256, + "defaults read org.puredata.pd %s 2> /dev/null\n", key); + } + else + { + snprintf(cmdbuf, 256, + "defaults read %s %s 2> /dev/null\n", default_prefs, key); + } FILE *fp = popen(cmdbuf, "r"); while (nread < size) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9789] trunk/packages/darwin_app/Info.plist.in
by eighthave＠users.sourceforge.net 13 May '08

13 May '08

Revision: 9789 http://pure-data.svn.sourceforge.net/pure-data/?rev=9789&view=rev Author: eighthave Date: 2008-05-12 15:27:41 -0700 (Mon, 12 May 2008) Log Message: ----------- laid out options for easy editing when people are building their own embedded pd apps Modified Paths: -------------- trunk/packages/darwin_app/Info.plist.in Modified: trunk/packages/darwin_app/Info.plist.in =================================================================== --- trunk/packages/darwin_app/Info.plist.in 2008-05-12 18:13:08 UTC (rev 9788) +++ trunk/packages/darwin_app/Info.plist.in 2008-05-12 22:27:41 UTC (rev 9789) @@ -22,28 +22,32 @@ </array> <key>CFBundleExecutable</key> <string>PD_APP_NAME</string> + <key>CFBundleIconFile</key> + <string>pd.icns</string> <key>CFBundleIdentifier</key> <string>org.puredata.pd.wish</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> + <key>CFBundleName</key> + <string>PD_APP_NAME</string> <key>CFBundlePackageType</key> <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>CFBUNDLESHORTVERSIONSTRING</string> <key>CFBundleSignature</key> <string>PdPd</string> - <key>CFBundleIconFile</key> - <string>pd.icns</string> - <key>CFBundleShortVersionString</key> - <string>CFBUNDLESHORTVERSIONSTRING</string> <key>CFBundleVersion</key> <string>CFBUNDLEVERSION</string> - <key>LSUIPresentationMode</key> - <integer>0</integer> - <key>LSUIElement</key> - <integer>0</integer> - <key>LSEnvironment</key> - <dict> - <key>EXAMPLE_ENVIRONMENT_VARIABLE</key> + <key>LSBackgroundOnly</key> + <false/> + <key>LSEnvironment</key> + <dict> + <key>EXAMPLE_ENVIRONMENT_VARIABLE</key> <string>this is just a test</string> - </dict> + </dict> + <key>LSUIElement</key> + <integer>0</integer> + <key>LSUIPresentationMode</key> + <integer>0</integer> </dict> </plist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2008