1 --- netkit-telnet-0.17-pre-20000204/telnet/commands.c.env Thu Apr 8 19:30:20 1999
2 +++ netkit-telnet-0.17-pre-20000204/telnet/commands.c Tue May 16 17:19:47 2000
3 @@ -1815,11 +1815,11 @@
7 -env_getvalue(unsigned char *var)
8 +env_getvalue(unsigned char *var, int exported_only)
11 + struct env_lst *ep = env_find(var);
13 - if ((ep = env_find(var)))
14 + if (ep && (!exported_only || ep->export))
18 --- netkit-telnet-0.17-pre-20000204/telnet/telnet.c.env Tue May 16 17:19:47 2000
19 +++ netkit-telnet-0.17-pre-20000204/telnet/telnet.c Tue May 16 17:19:47 2000
23 case TELOPT_XDISPLOC: /* X Display location */
24 - if (env_getvalue((unsigned char *)"DISPLAY"))
25 + if (env_getvalue((unsigned char *)"DISPLAY", 0))
31 if (tnamep && tnamep != unknown)
33 - if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
34 + if ((tname = (char *)env_getvalue((unsigned char *)"TERM", 0)) &&
35 (setupterm(tname, 1, &errret) == 0)) {
36 tnamep = mklist(ttytype, tname);
39 unsigned char temp[50], *dp;
42 - if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) {
43 + if ((dp = env_getvalue((unsigned char *)"DISPLAY", 0)) == NULL) {
45 * Something happened, we no longer have a DISPLAY
46 * variable. So, turn off the option.
51 - vp = env_getvalue(ep);
52 + vp = env_getvalue(ep, 1);
53 if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
54 strlen((char *)ep) + 6 > opt_replyend)
57 send_will(TELOPT_LINEMODE, 1);
58 send_will(TELOPT_NEW_ENVIRON, 1);
59 send_do(TELOPT_STATUS, 1);
60 - if (env_getvalue((unsigned char *)"DISPLAY"))
61 + if (env_getvalue((unsigned char *)"DISPLAY", 0))
62 send_will(TELOPT_XDISPLOC, 1);
64 tel_enter_binary(binary);
65 --- netkit-telnet-0.17-pre-20000204/telnet/externs.h.env Mon Feb 8 15:56:11 1999
66 +++ netkit-telnet-0.17-pre-20000204/telnet/externs.h Tue May 16 17:19:47 2000
68 void env_send (unsigned char *);
70 unsigned char * env_default(int init, int welldefined);
71 -unsigned char * env_getvalue(unsigned char *var);
72 +unsigned char * env_getvalue(unsigned char *var, int exported_only);
74 void set_escape_char(char *s);
75 unsigned long sourceroute(char *arg, char **cpp, int *lenp);
77 void env_opt_end (int);
79 unsigned char *env_default (int, int);
80 -unsigned char *env_getvalue (unsigned char *);
81 +unsigned char *env_getvalue (unsigned char *, int);
83 int get_status (void);