* cygwin-shilka: Remove '#line directives' or suffer debugging oddities. Use

-length option so that device prefixes are used.
* devices.cc: Regenerate.
* syscalls.cc (ttyname): Add debugging output.

winsup/cygwin/ChangeLog

@@ -1,3 +1,10 @@
+2003-09-27  Christopher Faylor  <cgf@redhat.com>
+
+	* cygwin-shilka: Remove '#line directives' or suffer debugging oddities.
+	Use -length option so that device prefixes are used.
+	* devices.cc: Regenerate.
+	* syscalls.cc (ttyname): Add debugging output.
+
 2003-09-26  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
 
 	* Makefile.in: Add libusr32.a to DLL_IMPORTS.

winsup/cygwin/Makefile.in

@@ -386,10 +386,10 @@ dcrt0.o sigproc.o: child_info_magic.h
 
 shared.o: shared_info_magic.h
 
-$(srcdir)/devices.cc: cygwin-gperf devices.gperf devices.h
+$(srcdir)/qevices.cc: cygwin-gperf devices.gperf devices.h
 	$^ > $@
 
-$(srcdir)/qevices.cc: cygwin-shilka devices.shilka devices.h
+$(srcdir)/devices.cc: cygwin-shilka devices.shilka devices.h
 	${wordlist 1,2,$^} $@
 
 $(PWD)/libpthread.a: speclib $(LIB_NAME) pthread.o thread.o

winsup/cygwin/cygwin-shilka

@@ -1,6 +1,8 @@
-#!/bin/sh -x
+#!/bin/sh
 c="$(basename $1 .shilka).c"
-shilka -strip -no-definitions $1 && \
+shilka -length -strip -no-definitions $1 && \
 sed -e '1,4d' -e '/KR_reset.*;/d' -e '/KR_output_statistics.*;/d' \
-    -e '/KR_reset.*)/,/}/d' -e '/KR_output_statistics.*)/,/}/d' "$c" > $2 &&
+    -e '/KR_reset.*)/,/}/d' -e '/KR_output_statistics.*)/,/}/d' \
+    -e '/# *line/d' "$c" > $2 &&
 rm -f "$c"
+#    -e "s%$c"'"%'"$2"'"%g' 

winsup/cygwin/fhandler.h

@@ -287,7 +287,7 @@ class fhandler_base
   int __stdcall fstat_by_name (struct __stat64 *buf) __attribute__ ((regparm (2)));
   virtual int ioctl (unsigned int cmd, void *);
   virtual int fcntl (int cmd, void *);
-  virtual char const *ttyname () { return get_name(); }
+  virtual char const *ttyname () { return get_name (); }
   virtual void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
   virtual int write (const void *ptr, size_t len);
   virtual ssize_t readv (const struct iovec *, int iovcnt, ssize_t tot = -1);

winsup/cygwin/syscalls.cc

@@ -1654,10 +1654,13 @@ pathconf (const char *file, int v)
 extern "C" char *
 ttyname (int fd)
 {
+  char *name;
   cygheap_fdget cfd (fd);
   if (cfd < 0 || !cfd->is_tty ())
     return 0;
-  return (char *) (cfd->ttyname ());
+  name = (char *) (cfd->ttyname ());
+  debug_printf ("returning %s", name);
+  return name;
 }
 
 extern "C" char *