diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | lock.c | 50 |
4 files changed, 54 insertions, 27 deletions
@@ -1,5 +1,12 @@ +2003-09-19 Michael Reinelt <reinelt@merlin.ethnet> + + * Makefile.am, Makefile.in, TODO, icon.c, widget.c, widget.h: + minor fixes, widget.c added + 2003-09-13 Michael Reinelt <reinelt@merlin.ethnet> + * ChangeLog, configure, configure.in: Changelog + * BeckmannEgle.c, Crystalfontz.c, Cwlinux.c, MatrixOrbital.c, PalmPilot.c, SIN.c, Skeleton.c, T6963.c, Text.c: icons for all remaining drivers @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for LCD4Linux 0.9.11-pre1. +# Generated by GNU Autoconf 2.57 for LCD4Linux 0.9.12. # # Report bugs to <reinelt@eunet.at>. # @@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='LCD4Linux' PACKAGE_TARNAME='lcd4linux' -PACKAGE_VERSION='0.9.11-pre1' -PACKAGE_STRING='LCD4Linux 0.9.11-pre1' +PACKAGE_VERSION='0.9.12' +PACKAGE_STRING='LCD4Linux 0.9.12' PACKAGE_BUGREPORT='reinelt@eunet.at' ac_unique_file="lcd4linux.c" @@ -787,7 +787,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LCD4Linux 0.9.11-pre1 to adapt to many kinds of systems. +\`configure' configures LCD4Linux 0.9.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -853,7 +853,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LCD4Linux 0.9.11-pre1:";; + short | recursive ) echo "Configuration of LCD4Linux 0.9.12:";; esac cat <<\_ACEOF @@ -953,7 +953,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -LCD4Linux configure 0.9.11-pre1 +LCD4Linux configure 0.9.12 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -968,7 +968,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LCD4Linux $as_me 0.9.11-pre1, which was +It was created by LCD4Linux $as_me 0.9.12, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1498,7 +1498,7 @@ fi PACKAGE=lcd4linux -VERSION=0.9.11-pre1 +VERSION=0.9.12 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -8562,7 +8562,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by LCD4Linux $as_me 0.9.11-pre1, which was +This file was extended by LCD4Linux $as_me 0.9.12, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8625,7 +8625,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -LCD4Linux config.status 0.9.11-pre1 +LCD4Linux config.status 0.9.12 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 535848d..1888dfb 100644 --- a/configure.in +++ b/configure.in @@ -2,9 +2,9 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([LCD4Linux],[0.9.11-pre1],[reinelt@eunet.at]) +AC_INIT([LCD4Linux],[0.9.12],[reinelt@eunet.at]) AC_CONFIG_SRCDIR([lcd4linux.c]) -AM_INIT_AUTOMAKE(lcd4linux,0.9.11-pre1) +AM_INIT_AUTOMAKE(lcd4linux,0.9.12) AM_CONFIG_HEADER(config.h) # Checks for programs. @@ -1,4 +1,4 @@ -/* $Id: lock.c,v 1.3 2001/04/27 05:04:57 reinelt Exp $ +/* $Id: lock.c,v 1.4 2003/09/19 08:40:32 reinelt Exp $ * * UUCP style locking * @@ -20,6 +20,12 @@ * * * $Log: lock.c,v $ + * Revision 1.4 2003/09/19 08:40:32 reinelt + * + * + * increased version number to 0.9.12 + * port locking is done as /var/lock/LCK..usb_tts_0 for /dev/usb/tts/0 + * * Revision 1.3 2001/04/27 05:04:57 reinelt * * replaced OPEN_MAX with sysconf() @@ -66,22 +72,29 @@ #include "lock.h" -pid_t lock_port (char *port) +pid_t lock_port (char *Port) { char lockfile[256]; char tempfile[256]; char buffer[16]; - char *p; + char *port, *p; int fd, len, pid; - if ((p=strrchr (port, '/'))==NULL) - p=port; - else - p++; + if (strncmp(Port, "/dev/", 5)==0) { + port=strdup(Port+5); + } else { + port=strdup(Port); + } + + while ((p=strchr(port, '/'))!=NULL) { + *p='_'; + } - snprintf(lockfile, sizeof(lockfile), LOCK, p); + snprintf(lockfile, sizeof(lockfile), LOCK, port); snprintf(tempfile, sizeof(tempfile), LOCK, "TMP.XXXXXX"); + free (port); + if ((fd=mkstemp(tempfile))==-1) { error ("mkstemp(%s) failed: %s", tempfile, strerror(errno)); return -1; @@ -157,17 +170,24 @@ pid_t lock_port (char *port) } -pid_t unlock_port (char *port) +pid_t unlock_port (char *Port) { char lockfile[256]; - char *p; + char *port, *p; - if ((p=strrchr (port, '/'))==NULL) - p=port; - else - p++; + if (strncmp(Port, "/dev/", 5)==0) { + port=strdup(Port+5); + } else { + port=strdup(Port); + } - snprintf(lockfile, sizeof(lockfile), LOCK, p); + while ((p=strchr(port, '/'))!=NULL) { + *p='_'; + } + + snprintf(lockfile, sizeof(lockfile), LOCK, port); unlink (lockfile); + free (port); + return 0; } |