View | Details | Raw Unified | Return to bug 170269
Collapse All | Expand All

(-)common/session-env.c (-2 / +6 lines)
Lines 328-335 Link Here
328
328
329 
  /* Get the default value with and additional fallback for GPG_TTY.  */
 329 
  /* Get the default value with and additional fallback for GPG_TTY.  */
330 
  defvalue = getenv (name);
 330 
  defvalue = getenv (name);
331 
  if ((!defvalue || !*defvalue) && !strcmp (name, "GPG_TTY") && ttyname (0))
 331 
  if ((!defvalue || !*defvalue) && !strcmp (name, "GPG_TTY"))
332 
    defvalue = ttyname (0);
 332 
    {
333 
      defvalue = ttyname (0);
334 
      if (!defvalue)
335 
        defvalue = "/dev/tty";
336 
    }
333 
  if (defvalue)
 337 
  if (defvalue)
334 
    {
 338 
    {
335 
      /* Record the default value for later use so that we are safe
 339 
      /* Record the default value for later use so that we are safe
(-)common/simple-pwquery.c (-1 / +5 lines)
Lines 224-230 Link Here
224 
  dft_ttyname = getenv ("GPG_TTY");
 224 
  dft_ttyname = getenv ("GPG_TTY");
225 
#ifndef HAVE_W32_SYSTEM
 225 
#ifndef HAVE_W32_SYSTEM
226 
  if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
 226 
  if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
227 
    dft_ttyname = ttyname (0);
 227 
    {
228 
      dft_ttyname = ttyname (0);
229 
      if (!dft_ttyname)
230 
        dft_ttyname = "/dev/tty";
231 
    }
228 
#endif
 232 
#endif
229 
  if (dft_ttyname && *dft_ttyname)
 233 
  if (dft_ttyname && *dft_ttyname)
230 
    {
 234 
    {

Return to bug 170269