1 diff -ruN screen-3.9.10.org/fileio.c screen-3.9.10/fileio.c
2 --- screen-3.9.10.org/fileio.c Thu May 3 16:43:24 2001
3 +++ screen-3.9.10/fileio.c Sun Jun 2 01:23:37 2002
9 + if (getenv("CONFIG_DIR")) {
10 + debug(" ...nothing in $SCREENRC, defaulting $HOME/$CONFIG_DIR/screen/screenrc\n");
11 + if ((strlen(home)+strlen(getenv("CONFIG_DIR"))+7) > sizeof(buf) - 12)
12 + Panic(0, "Rc: home too large");
13 + sprintf(buf, "%s/%s/screen/screenrc", home, getenv("CONFIG_DIR"));
17 debug(" ...nothing in $SCREENRC, defaulting $HOME/.screenrc\n");
18 if (strlen(home) > sizeof(buf) - 12)
19 Panic(0, "Rc: home too large");
20 diff -ruN screen-3.9.10.org/screen.c screen-3.9.10/screen.c
21 --- screen-3.9.10.org/screen.c Sun Jun 2 01:08:28 2002
22 +++ screen-3.9.10/screen.c Sun Jun 2 01:27:43 2002
27 - snprintf(bufferfile,sizeof(bufferfile),"%s/.screen-exchange", home);
28 + if (getenv("CONFIG_DIR"))
29 + snprintf(bufferfile,sizeof(bufferfile),"%s/%s/screen/exchange", home, getenv("CONFIG_DIR"));
31 + snprintf(bufferfile,sizeof(bufferfile),"%s/.screen-exchange", home);
32 BufferFile = SaveStr(bufferfile);
34 oumask = umask(0); /* well, unsigned never fails? jw. */
39 - sprintf(SockPath, "%s/.screen", multi_home);
40 + if (getenv("CONFIG_DIR"))
41 + sprintf(SockPath, "%s/%s/screen/sockets", multi_home, getenv("CONFIG_DIR"));
43 + sprintf(SockPath, "%s/.screen", multi_home);
51 - sprintf(SockPath, "%s/.screen", home);
52 + if (getenv("CONFIG_DIR"))
53 + sprintf(SockPath, "%s/%s/screen/sockets", home, getenv("CONFIG_DIR"));
55 + sprintf(SockPath, "%s/.screen", home);