Skip to content

Commit

Permalink
Applied a patch from Bron Gondawna.
Browse files Browse the repository at this point in the history
  • Loading branch information
azummo committed Jul 4, 2002
1 parent 0be3171 commit 770fcf4
Show file tree
Hide file tree
Showing 21 changed files with 2,668 additions and 2,265 deletions.
4 changes: 3 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: AUTHORS,v 2.20 2002-05-03 00:08:00 arensb Exp $
# $Id: AUTHORS,v 2.21 2002-07-04 21:03:26 azummo Exp $

Authors and Contributors:

Expand Down Expand Up @@ -45,6 +45,8 @@ Alessandro Zummo <[email protected]>: new functions in SPC.pm,
Kenneth Lorber <[email protected]>: pda_block propagation patch.
Michael Lestinsky <[email protected]>: PCONNFL_PROMPT patch.
Takeshi AIHANA <[email protected]>: Japanese translation.
Bron Gondawna <[email protected]>: Modem support, command line config file
in daemon mode and wildcards in palms file.

A big thank you to Kenneth Albanowski and the rest of the
authors of the pilot-link code, for providing a reference
Expand Down
34 changes: 34 additions & 0 deletions ChangeLog.2
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
2002-06-21 Bron Gondwana <[email protected]>

* include/pconn/PConnection.h: Add flag PCONNFL_MODEM.

* libpconn/PConnection.c: Copy flags into pconn->flags rather than
passing it to the pconn_*_open functions, as it is required in other
functions for modem support.

* libpconn/Pconnection_net.c: Function definition change for open
and use pconn->flags rather than flags.

* libpconn/Pconnection_serial.c: Function definition change for open
and use pconn->flags rather than flags, serial_write to STDOUT_FILENO
if pconn->fd == STDIN_FILENO, don't do any setspeed if flags &
PCONNFL_MODEM. Special case device string 'stdin' means read from
stdin (note: linux has a /dev/stdin, but this is more portable)

* libpconn/Pconnection_usb.c: Function definition change for open
and use pconn->flags rather than flags.

* src/coldsync.c: Read the user config file in run_mode_Daemon if it's
provided on the command line, re-write flags from LISTENFL_* to
PCONNFL_* during new_PConnection so they don't have to be kept in sync.

* src/coldsync.h: Added LISTENFL_MODEM for modem support.

* src/lexer.l: Added MODEM keyword literal string 'modem'.

* src/palment.c: Wildcards for the columns serial ('' or '*'),
username ('' or '*'), userid (0) such that they match any palm.

* src/parser.y: token MODEM sets flag LISTENFL_MODEM on the current
listen block if seen.

2001-12-10 Andrew Arensburger <[email protected]>

* libpconn/dlp_cmd.c: Removed a to-do comment. Yay!
Expand Down
25 changes: 20 additions & 5 deletions doc/coldsync.8
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.\" You may distribute this file under the terms of the Artistic
.\" License, as specified in the README file.
.\"
.\" $Id: coldsync.8,v 1.52 2002-03-14 19:01:32 arensb Exp $
.\" $Id: coldsync.8,v 1.53 2002-07-04 21:03:26 azummo Exp $
.\"
.\" This man page uses the 'mdoc' formatting macros. If your 'man' uses
.\" the old 'man' package, you may run into problems.
Expand Down Expand Up @@ -118,7 +118,11 @@ in which case the given pathname is assumed to be relative to
.Pa /dev ,
or the string
.Dq -
(a single dash), meaning stdin.
(a single dash), or meaning stdin and stdout. The special string 'stdin'
also means stdin and stdout (useful with mgetty and modems). ***PLEASE NOTE
THIS FUNCTIONALITY IS DISABLED IN CURRENT DEVELOPMENT BUILDS (use config
files with -f on the command line and specify the device there instead,
using stdin instead of '-' if necessary)***
.Pp
.Nm ColdSync
waits for a connection on the given port, reads the username and user
Expand Down Expand Up @@ -381,6 +385,11 @@ listen usb { # BSD only

listen net {
}

listen serial {
device: stdin;
modem;
}
.Ed
.Pp
.Li listen serial
Expand All @@ -405,6 +414,12 @@ directive indicates that the device may not exist when
starts, but will be created later on, when the Palm connects to the
workstation. Use this if you are using devfs.
.Pp
The
.Li modem
directive indicates that the device is a modem, so
.Nm ColdSync
will not attempt to change the line speed and break the connection.
.Pp
.Li listen usb
is used to sync a Handspring Visor using native USB mode. This only
works under *BSD.
Expand Down Expand Up @@ -935,11 +950,11 @@ single line, with fields separated by vertical bar (pipe) characters:
.Ed
.Bl -tag -width password -offset indent
.It serial
The serial number of the Palm, or the empty string if none or missing.
The serial number of the Palm. The empty string or '*' will match any palm.
.It username
The username on the Palm.
The username on the Palm. The empty string or '*' will match any palm.
.It userid
The user ID on the Palm.
The user ID on the Palm. The number '0' will match any palm.
.It luser
The local (Unix) username or UID to setuid() to.
.It name
Expand Down
17 changes: 13 additions & 4 deletions doc/new_PConnection.3
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.\" You may distribute this file under the terms of the Artistic
.\" License, as specified in the README file.
.\"
.\" $Id: new_PConnection.3,v 1.3 2001-11-12 00:09:09 arensb Exp $
.\" $Id: new_PConnection.3,v 1.4 2002-07-04 21:03:26 azummo Exp $
.\"
.\" This man page uses the 'mdoc' formatting macros. If your 'man' uses
.\" the old 'man' package, you may run into problems.
Expand Down Expand Up @@ -40,9 +40,9 @@ specifies the pathname of the Palm device, \fIe.g.\fR
.Pa /dev/cuaa0
for a serial port. If
.Fa device
is NULL,
is NULL or the special string 'stdin',
.Nm
uses standard input.
uses standard input and standard output.
.Pp
.Fa listenType
specifies the underlying connection to the Palm cradle. It is one of:
Expand Down Expand Up @@ -85,8 +85,10 @@ Use the DLP and NetSync protocols. This is the default for
.Fa flags
is the bitwise-or of
.Dv PCONNFL_TRANSIENT
and
,
.Dv PCONNFL_PROMPT .
and
.Dv PCONNFL_MODEM .
If
.Dv PCONN_TRANSIENT
has been specified, the device may or may not exist at any given time,
Expand All @@ -100,6 +102,13 @@ has been specified,
.Nm
will prompt the user to press the HotSync button on the cradle, after
the device has been opened.
.Pp
If
.Dv PCONN_MODEM
has been specified,
.Nm
will not attept to change the change the speed of the connection that
specified by the palm, which breaks modem connections.
.Sh RETURN VALUE
.Nm
returns a pointer to a new
Expand Down
10 changes: 9 additions & 1 deletion doc/sample.coldsync.rc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sample.coldsyncrc
#
# $Id: sample.coldsync.rc,v 1.5 2001-10-12 02:16:26 arensb Exp $
# $Id: sample.coldsync.rc,v 1.6 2002-07-04 21:03:26 azummo Exp $
#
# This is an example .coldsyncrc file. It is NOT intended as a working
# configuration. It is rather a series of examples. Read it through.
Expand Down Expand Up @@ -33,6 +33,14 @@ listen serial {
speed: 38400;
}

# OR, if you're using a modem with mgetty, disable the above listen block
# and insert this one.
#
# listen serial {
# device: stdin;
# modem;
# }

# If you're syncing a Visor over USB under FreeBSD, use "usb" instead
# of "serial":

Expand Down
Loading

0 comments on commit 770fcf4

Please sign in to comment.