Changeset 1237:f7c55376fad3 in roaraudio

Timestamp:

02/25/09 22:50:31 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

test for tty dev

Files:

• configure (modified) (4 diffs)
• libroar/pinentry.c (modified) (1 diff)

configure

@@ -32 +32 @@
 OSS_DEV="none"
 PROC_NET_DECNET="/proc/net/decnet"
+TTY_DEV="none"
 
 DEFAULT_GRP=''
@@ -103 +104 @@
    echo
    echo '--cdrom DEV                 - Set default CDRum device'
+   echo '--tty DEV                   - Set default TTY'
    echo '--proc-net-decnet FILE      - Set DECnet file for DECnet support auto detecting'
    echo '                              (ignore this on non-Linux)'
@@ -160 +162 @@
   '--cdrom')
    CDROM="$2"
+   shift;
+  ;;
+  '--tty')
+   TTY_DEV="$2"
    shift;
   ;;
@@ -755 +761 @@
 fi
 
+echo -n 'checking for default tty device... '
+if [ -e "$TTY_DEV" ]
+then
+ echo "$TTY_DEV"
+ echo '#define ROAR_DEFAULT_TTY "'"$TTY_DEV"'"' >&3
+else
+ TTY_DEV=$(ls /dev/tty 2> /dev/null | head -n 1);
+ if [ -e "$TTY_DEV" ]
+ then
+  echo "$TTY_DEV"
+  echo '#define ROAR_DEFAULT_TTY "'"$TTY_DEV"'"' >&3
+ else
+  echo 'none'
+ fi
+fi
+
 echo -n 'checking for OSS device... '
 if [ -e "$OSS_DEV" ]

libroar/pinentry.c

@@ -56 +56 @@
 
  if ( tty == NULL )
-  tty = "/dev/tty"; // TODO: make compile time config parameter out of this
+#ifdef ROAR_DEFAULT_TTY
+  tty = ROAR_DEFAULT_TTY;
+#else
+  return -1;
+#endif
 
  if ( term == NULL )