linux-decnet-commit Mailing List for DECnet for Linux (Page 15)
Brought to you by:
chrissie_c,
ph3-der-loewe
Menu
▾
▴
linux-decnet-commit — CVS commits to the DECnet project
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(15) |
Nov
(16) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(20) |
Feb
(27) |
Mar
(25) |
Apr
(12) |
May
(2) |
Jun
(6) |
Jul
(36) |
Aug
(12) |
Sep
(12) |
Oct
(16) |
Nov
(5) |
Dec
(5) |
| 2003 |
Jan
(8) |
Feb
(9) |
Mar
(25) |
Apr
(18) |
May
(29) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(10) |
Oct
(5) |
Nov
(3) |
Dec
(9) |
| 2004 |
Jan
(17) |
Feb
|
Mar
(9) |
Apr
|
May
(4) |
Jun
(1) |
Jul
(2) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2005 |
Jan
(5) |
Feb
|
Mar
(13) |
Apr
|
May
(3) |
Jun
(1) |
Jul
|
Aug
|
Sep
(13) |
Oct
(83) |
Nov
(2) |
Dec
|
| 2006 |
Jan
(21) |
Feb
(1) |
Mar
(32) |
Apr
(31) |
May
(3) |
Jun
(1) |
Jul
|
Aug
(7) |
Sep
|
Oct
(1) |
Nov
(3) |
Dec
(13) |
| 2007 |
Jan
(1) |
Feb
(7) |
Mar
|
Apr
(2) |
May
|
Jun
(1) |
Jul
(2) |
Aug
(20) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2008 |
Jan
(4) |
Feb
(13) |
Mar
(24) |
Apr
(18) |
May
(10) |
Jun
|
Jul
|
Aug
(40) |
Sep
(72) |
Oct
(61) |
Nov
(9) |
Dec
(2) |
| 2009 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
(41) |
Aug
(28) |
Sep
(2) |
Oct
(5) |
Nov
(4) |
Dec
|
| 2011 |
Jan
(7) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christine C. <chr...@us...> - 2008-03-10 13:01:31
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32401 Modified Files: Makefile Added Files: mount.dapfs.8 Log Message: Add man page and install it. install dapfs as mount.dapfs --- NEW FILE: mount.dapfs.8 --- .TH DAPFS 8 "March 10 2008" "DECnet utilities" .SH NAME mount.dapfs \- Mount DAP filesystem over DECnet .SH SYNOPSIS .B mount.dapfs <node> <mount-point> [-o options] [options] .br .SH DESCRIPTION .PP This tool is part of the DECnet programs (dnprogs) suite. .br mount.dapfs mounts a DAP filesystem on (probably) a VMS server as a directory on a Linux system. It is invoked by the mount command when usig the -t dapfs switch. dapfs use the FUSE (Filesystem in USEr space) system. .br The node name specified must exist in /etc/decnet.conf or be a node address. With no options given dapfs will connect using a default DECnet account on the remote server. .br .SH OPTIONS .TP .B username= tells dapfs to use this username for the connection. .B password= tells dapfs to use this password for the connection. .B .SH EXAMPLES .br # mount -tdapfs zarqon /mnt/vax .br Mounts the default DECnet account on node ZARQON onto the Linux filesystem /mnt/vax .br # mount -tdapfs alpha1 /mnt/alpha -ousername=SYSTEM,-opassword=field .br Mounts the home directory for the user SYSTEM on node ALPHA1, using the password "field" on /mnt/alpha. .SH CAVEATS All files are access by record and this can cause some odd effects if you are not expecting them. The file size shown by VMS includes the record overhead of RMS, but dapfs shows only the record contents. utilities that get the file size (using stat) then read that many bytes into a buffer will end up with a file padded with zeros. There's not much I can do about this. Later versions of dapfs might include an option to disable record access, but I think this is less useful as it would have to be filesystem-wide. .br Seeking doesn't work unless you have a remote server that supports STREAM access to files (currently VMS 7.x seems not to). This means that some utilities (eg unzip) will not work as they try to seek inside the file looking for data. .SH SEE ALSO .BR decnet.proxy "(5), " dnetd "(8), " dnetd.conf "(5), " dntype "(1), " dndir "(1), " dndel "(1), " dntask "(1), " dnsubmit "(1), " dnprint "(1)" Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Makefile 26 Feb 2008 16:06:21 -0000 1.6 --- Makefile 10 Mar 2008 13:01:27 -0000 1.7 *************** *** 5,9 **** PROG1=dapfs ! MANPAGES=dapfs.1 PROG1OBJS=dapfs.o dapfs_dap.o filenames.o --- 5,9 ---- PROG1=dapfs ! MANPAGES=mount.dapfs.8 PROG1OBJS=dapfs.o dapfs_dap.o filenames.o *************** *** 18,25 **** install: ! install -d $(prefix)/bin ! install -d $(manprefix)/man/man1 ! install -m 0755 $(STRIPBIN) $(PROG1) $(prefix)/bin ! install -m 0644 $(MANPAGES) $(manprefix)/man/man1 dep depend: --- 18,25 ---- install: ! install -d $(prefix)/sbin ! install -d $(manprefix)/man/man8 ! install -m 0755 $(STRIPBIN) $(PROG1) $(prefix)/sbin/mount.dapfs ! install -m 0644 $(MANPAGES) $(manprefix)/man/man8 dep depend: |
|
From: Christine C. <chr...@us...> - 2008-03-10 12:42:58
|
Update of /cvsroot/linux-decnet/dnprogs/Documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25268/Documentation Modified Files: dapfs.README Log Message: Change the way mount options work so we don't show the passwork in "df" Index: dapfs.README =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/Documentation/dapfs.README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dapfs.README 28 Oct 2005 15:15:21 -0000 1.2 --- dapfs.README 10 Mar 2008 12:42:54 -0000 1.3 *************** *** 26,41 **** and use the followng syntax: ! mount -tfuse dapfs#filespec <mountpoint> Here are some examples: ! mount -tfuse dapfs#zarqon:: /mnt/vax this will use the default DECnet account on 'zarqon' or a proxy for "ROOT" - mount -tfuse dapfs#'ford"patrick password"::' /mnt/alpha - this will use the specified user account. NOTE that the password will be shown - in the output of the 'df' command! Also note the use of quotes here, the single - quotes are needed to protect the double quotes from the shell. --- 26,38 ---- and use the followng syntax: ! # mount -tdapfs node <mountpoint> Here are some examples: ! # mount -tdapfs zarqon /mnt/vax this will use the default DECnet account on 'zarqon' or a proxy for "ROOT" + mount -tdapfs ford /mnt/alpha -ousername=system,password=field |
|
From: Christine C. <chr...@us...> - 2008-03-10 12:42:58
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25268/dapfs Modified Files: dapfs.c Log Message: Change the way mount options work so we don't show the passwork in "df" Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** dapfs.c 27 Feb 2008 14:03:49 -0000 1.17 --- dapfs.c 10 Mar 2008 12:42:54 -0000 1.18 *************** *** 14,20 **** */ /* dapfs via FUSE */ ! // # mount -tfuse dapfs#'alpha1"chrissie password"::' /mnt/dap ! // or for debugging: ! // # ./dapfs zarqon:: /mnt/vax -odebug #define _FILE_OFFSET_BITS 64 --- 14,19 ---- */ /* dapfs via FUSE */ ! // # mount -tdapfs alpha1 /mnt/dap ! // # mount -tdapfs zarqon /mnt/dap -ousername=christine,password=password #define _FILE_OFFSET_BITS 64 *************** *** 568,571 **** --- 567,639 ---- }; + static void process_options(char *options) + { + char *scratch = strdup(options); + char *t; + char *password = NULL; + char *username = NULL; + char *optptr; + + if (!scratch) + return; + + t = strtok(scratch, ","); + while (t) + { + char *option; + + option = strchr(t, '='); + if (!option) + goto next_tok; + option++; + + optptr = t + strspn(t, " "); + if (strncmp("username=", optptr, 9) == 0) + username = strdup(option); + if (strncmp("password=", optptr, 9) == 0) + password = strdup(option); + if (strncmp("debug=", optptr, 6) == 0) + debug = atoi(option); + + next_tok: + t = strtok(NULL, ","); + } + if (!password) + password = ""; + if (username) + sprintf(prefix, "%s\"%s %s\"", prefix, username, password); + + free(scratch); + } + + static void find_options(int *argc, char *argv[]) + { + int i; + + // Find -o, and process any we find + for (i=0; i < *argc; i++) + { + if (strncmp(argv[i], "-o", 2) == 0) + { + process_options(argv[i] + 2); + argv[i] = NULL; + } + } + + // Remove any NULL args. These will be ones we have parsed but + // mount_fuse will choke on + for (i=1; i < *argc; i++) + { + if (argv[i] == NULL) + { + int j; + for (j = i; j < *argc; j++) + argv[j] = argv[j+1]; + (*argc)--; + i--; + } + } + } + int main(int argc, char *argv[]) { *************** *** 573,584 **** return 1; ! /* This is only useful when dapfs is run directly and with -odebug */ ! if (getenv("DAPFS_DEBUG")) ! debug = atoi(getenv("DAPFS_DEBUG")); ! ! // This is the host name ending :: (eg zarqon"chrissie password"::) strcpy(prefix, argv[1]); strcpy(mountdir, argv[2]); // Make a scratch connection - also verifies the path name nice and early if (dap_init()) { --- 641,660 ---- return 1; ! // This is just the host name at the moment strcpy(prefix, argv[1]); + + // Save the location we are mounted on. strcpy(mountdir, argv[2]); + // Get username and password and other things from -o + find_options(&argc, argv); + + // Add "::" to the hostname to get a prefix, now that the username + // and password have been added in, if provided. + strcat(prefix, "::"); + + if (debug&2) + fprintf(stderr, "prefix is now: %s\n", prefix); + // Make a scratch connection - also verifies the path name nice and early if (dap_init()) { |
|
From: Christine C. <chr...@us...> - 2008-02-27 14:11:34
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31826 Added Files: BUGS Log Message: Bug list --- NEW FILE: BUGS --- - getattr doesn't return the right size for reads, because of record mungeing. Not much we can do about that :( - Seeking doesn't work. VMS 7.3(VAX & Alpha) seems not to support Stream access over DAP |
|
From: Christine C. <chr...@us...> - 2008-02-27 14:03:58
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27437 Modified Files: dapfs.c dapfs_dap.cc Log Message: A couple more bug fixes, and a (failed) attempt to get seeking to work. Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** dapfs.c 26 Feb 2008 16:23:30 -0000 1.16 --- dapfs.c 27 Feb 2008 14:03:49 -0000 1.17 *************** *** 83,87 **** /* Print files have a two-byte header indicating the line length. */ ! if (fh->rat & RAT_PRN) { memmove(buf, buf + fh->fsz, retlen - fh->fsz); --- 83,87 ---- /* Print files have a two-byte header indicating the line length. */ ! if (fh->rat & RAT_PRN && len >= fh->fsz) { memmove(buf, buf + fh->fsz, retlen - fh->fsz); *************** *** 384,393 **** fprintf(stderr, "dapfs_read: new offset is %lld, old was %lld\n", offset, h->offset); loffset = (unsigned int)offset; ! rab.rab$l_kbf = &loffset; ! rab.rab$b_rac = 2;//FB$RFA; ! rab.rab$b_ksz = sizeof(offset); /* Throw away saved partial record */ ! free(h->recordbuf); h->recordbuf = NULL; } --- 384,397 ---- fprintf(stderr, "dapfs_read: new offset is %lld, old was %lld\n", offset, h->offset); loffset = (unsigned int)offset; ! rab.rab$l_kbf = &offset; ! rab.rab$b_rac = 6;// Stream 2;//FB$RFA; ! rab.rab$b_ksz = 6;// 3x words, like an RFA// sizeof(loffset); ! rab.rab$w_usz = size; ! ! h->offset = offset; /* Throw away saved partial record */ ! if (h->recordbuf) ! free(h->recordbuf); h->recordbuf = NULL; } *************** *** 412,415 **** --- 416,426 ---- do { res = rms_read(h->rmsh, buf+got, size-got, &rab); + + if (rms_lasterror(h->rmsh) && debug&2) + fprintf(stderr, "dapfs_read: res=%d, rms error: %s\n", res, rms_lasterror(h->rmsh)); + + if (res == -1) + return -EOPNOTSUPP; + // if res == 0 and there is no error then we read // an empty record. Index: dapfs_dap.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs_dap.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** dapfs_dap.cc 26 Feb 2008 13:07:55 -0000 1.11 --- dapfs_dap.cc 27 Feb 2008 14:03:49 -0000 1.12 *************** *** 421,424 **** --- 421,427 ---- make_vms_filespec(path, vmsname, 0); + if (vmsname[strlen(vmsname)-1] == '.') + vmsname[strlen(vmsname)-1] = '\0'; + dap_access_message acc; acc.set_accfunc(dap_access_message::ERASE); |
|
From: Christine C. <chr...@us...> - 2008-02-26 16:23:37
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5498/dapfs Modified Files: dapfs.c Log Message: Fix mkdir & rmdir that I broke with the filename changes. Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** dapfs.c 26 Feb 2008 16:06:21 -0000 1.15 --- dapfs.c 26 Feb 2008 16:23:30 -0000 1.16 *************** *** 172,175 **** --- 172,178 ---- make_vms_filespec(path, vmsname, 0); + if (vmsname[strlen(vmsname)-1] == '.') + vmsname[strlen(vmsname)-1] = '\0'; + sprintf(fullname, "REMOVE %s.DIR;1", vmsname); len = get_object_info(fullname, reply); *************** *** 228,233 **** char vmsname[VMSNAME_LEN]; char reply[BUFLEN]; - int len; char *lastbracket; if (debug&1) --- 231,236 ---- char vmsname[VMSNAME_LEN]; char reply[BUFLEN]; char *lastbracket; + int len; if (debug&1) *************** *** 235,245 **** make_vms_filespec(path, vmsname, 0); ! // Ths gives is a name like '[]pjc' which we ! // need to turn into [.pjc] lastbracket = strchr(vmsname, ']'); ! if (!lastbracket) ! return -EINVAL; ! ! *lastbracket = '.'; /* make_vms_filespec() often leaves a trailing dot */ --- 238,256 ---- make_vms_filespec(path, vmsname, 0); ! // for a top-level directory, ! // Ths gives is a name like 'newdir' which we ! // need to turn into [.newdir] ! if (vmsname[0] != '[') { ! memmove(vmsname+2, vmsname, strlen(vmsname)+1); ! vmsname[0]='['; ! vmsname[1]='.'; ! } ! /* Replace closing ']' with '.'. eg ! [mydir]newdir] becomes ! [mydir.newdir] ! */ lastbracket = strchr(vmsname, ']'); ! if (lastbracket) ! *lastbracket = '.'; /* make_vms_filespec() often leaves a trailing dot */ |
|
From: Christine C. <chr...@us...> - 2008-02-26 16:06:26
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29250/dapfs Modified Files: Makefile dapfs.c filenames.c Log Message: Allow partial record reads. as FUSE needs the buffer to be filled regardless of whether it is on a record boundary or not. This will probably make a mess of FORTRAN files where records span the buffer. Let me know if this is a problem :) Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile 26 Feb 2008 09:51:30 -0000 1.5 --- Makefile 26 Feb 2008 16:06:21 -0000 1.6 *************** *** 11,19 **** all: $(PROG1) ! CFLAGS=-g -I../include LDFLAGS=-g $(PROG1): $(PROG1OBJS) $(DEPLIBS) ! g++ -o$(PROG1) $(PROG1OBJS) -lrms -lfuse install: --- 11,19 ---- all: $(PROG1) ! CFLAGS=-g -I../include -Wall LDFLAGS=-g $(PROG1): $(PROG1OBJS) $(DEPLIBS) ! g++ -o$(PROG1) $(LDFLAGS) $(PROG1OBJS) -L../librms -lrms -lfuse install: Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** dapfs.c 26 Feb 2008 13:07:54 -0000 1.14 --- dapfs.c 26 Feb 2008 16:06:21 -0000 1.15 *************** *** 48,51 **** --- 48,53 ---- /* Last known offset in the file */ off_t offset; + char *recordbuf; // For when we need to split a record + int rbuf_len; }; *************** *** 74,81 **** int retlen = len; ! /* If the file has implied carriage control then add an LF to the end of the line */ if ((fh->rfm != RFM_STMLF) && ! (fh->rat & RAT_CR || fh->rat & RAT_PRN)) buf[retlen++] = '\n'; /* Print files have a two-byte header indicating the line length. */ --- 76,84 ---- int retlen = len; ! /* If the file has implied carriage control then add a CR/LF to the end of the line. */ if ((fh->rfm != RFM_STMLF) && ! (fh->rat & RAT_CR || fh->rat & RAT_PRN)) { buf[retlen++] = '\n'; + } /* Print files have a two-byte header indicating the line length. */ *************** *** 195,199 **** if (debug&1) ! fprintf(stderr, "dapfs_truncate: %s, %ld\n", path, size); make_vms_filespec(path, vmsname, 0); --- 198,202 ---- if (debug&1) ! fprintf(stderr, "dapfs_truncate: %s, %lld\n", path, size); make_vms_filespec(path, vmsname, 0); *************** *** 351,359 **** int res; int got = 0; struct RAB rab; struct dapfs_handle *h = (struct dapfs_handle *)fi->fh; if (debug&1) ! fprintf(stderr, "dapfs_read: %s\n", path); if (!h) { --- 354,363 ---- int res; int got = 0; + unsigned int loffset = 0; struct RAB rab; struct dapfs_handle *h = (struct dapfs_handle *)fi->fh; if (debug&1) ! fprintf(stderr, "dapfs_read: %s offset=%lld\n", path, offset); if (!h) { *************** *** 366,372 **** memset(&rab, 0, sizeof(rab)); if (offset && offset != h->offset) { ! rab.rab$l_kbf = &offset; rab.rab$b_rac = 2;//FB$RFA; rab.rab$b_ksz = sizeof(offset); } --- 370,397 ---- memset(&rab, 0, sizeof(rab)); if (offset && offset != h->offset) { ! if (debug&2) ! fprintf(stderr, "dapfs_read: new offset is %lld, old was %lld\n", offset, h->offset); ! loffset = (unsigned int)offset; ! rab.rab$l_kbf = &loffset; rab.rab$b_rac = 2;//FB$RFA; rab.rab$b_ksz = sizeof(offset); + + /* Throw away saved partial record */ + free(h->recordbuf); + h->recordbuf = NULL; + } + + // Add in saved record + if (h->recordbuf) { + if (debug&2) + fprintf(stderr, "dapfs_read: adding saved partial record %d bytes\n", h->rbuf_len); + + res = convert_rms_record(h->recordbuf, h->rbuf_len, h); + + memcpy(buf, h->recordbuf, res); + got += res; + h->offset += res; + free(h->recordbuf); + h->recordbuf = NULL; } *************** *** 376,389 **** do { res = rms_read(h->rmsh, buf+got, size-got, &rab); ! if (res > 0) { res = convert_rms_record(buf+got, res, h); got += res; } if (res < 0 && got) { ! // Not enough room for a record but we read something ! return got; } ! } while (res > 0); if (res >= 0) res = got; --- 401,439 ---- do { res = rms_read(h->rmsh, buf+got, size-got, &rab); ! // if res == 0 and there is no error then we read ! // an empty record. ! if (res >= 0 && !rms_lasterror(h->rmsh)) { res = convert_rms_record(buf+got, res, h); got += res; + h->offset += res; } if (res < 0 && got) { ! int recordlen = -res; ! int remainderspace = size-got; ! ! // Not enough room for a full record. split it. ! // Read the partial record and return as much as the user ! // requested. Save the remainder for the next read. ! h->recordbuf = malloc(recordlen); ! if (!h->recordbuf) ! return -ENOMEM; ! ! recordlen = rms_read(h->rmsh, h->recordbuf, recordlen, &rab); ! memcpy(buf+got, h->recordbuf, remainderspace); ! ! memmove(h->recordbuf, h->recordbuf + remainderspace, recordlen-remainderspace); ! h->rbuf_len = recordlen-remainderspace; ! h->offset += remainderspace; ! ! if (debug&2) ! fprintf(stderr, "dapfs_read: saving %d bytes of %d byte partial record\n", recordlen-remainderspace, recordlen); ! ! if (debug&1) ! fprintf(stderr, "dapfs_read: returning %d, offset = %lld\n", got+remainderspace, h->offset); ! ! return got + remainderspace; } ! } while (!rms_lasterror(h->rmsh)); if (res >= 0) res = got; *************** *** 391,399 **** if (res == -1) res = -errno; - else - h->offset += res; if (debug&1) ! fprintf(stderr, "dapfs_read: returning %d\n", res); return res; } --- 441,447 ---- if (res == -1) res = -errno; if (debug&1) ! fprintf(stderr, "dapfs_read: returning %d, offset=%lld\n", res, h->offset); return res; } Index: filenames.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/filenames.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** filenames.c 26 Feb 2008 13:07:55 -0000 1.7 --- filenames.c 26 Feb 2008 16:06:21 -0000 1.8 *************** *** 61,65 **** int i; char *lastslash; - struct stat st; // Take a copy wwe can muck about with --- 61,64 ---- |
|
From: Christine C. <chr...@us...> - 2008-02-26 16:03:13
|
Update of /cvsroot/linux-decnet/dnprogs/Documentation In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28095/Documentation Modified Files: librms.README Log Message: rms_read() can return 0 if there is an empty record in the file. Allow callers to differentiate between that and EOF by setting rms_lasterr() appropriately. Index: librms.README =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/Documentation/librms.README,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** librms.README 15 Oct 2005 15:07:18 -0000 1.6 --- librms.README 26 Feb 2008 16:03:05 -0000 1.7 *************** *** 97,101 **** Returns -1 if the function failed for any reason, or a positive number ! indicating the number of bytes read. 0 indicates end-of file. If the record just read is larger than 'maxlen' then the return value will be the negative value of the actual size of the record and buf will not --- 97,106 ---- Returns -1 if the function failed for any reason, or a positive number ! indicating the number of bytes read. 0 indicates end-of file only if ! rms_lasterr() contains "EOF". if not then you have just read an empty record! ! The best way to check for an empty record is (res == 0 && !rms_lasterr()). If ! you get a return of 0 and rms_lasterr() is non-NULL then you have reached the ! end of the file. ! If the record just read is larger than 'maxlen' then the return value will be the negative value of the actual size of the record and buf will not |
|
From: Christine C. <chr...@us...> - 2008-02-26 16:03:11
|
Update of /cvsroot/linux-decnet/dnprogs/librms In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28095/librms Modified Files: readwrite.cc Log Message: rms_read() can return 0 if there is an empty record in the file. Allow callers to differentiate between that and EOF by setting rms_lasterr() appropriately. Index: readwrite.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/librms/readwrite.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** readwrite.cc 26 Feb 2008 14:20:57 -0000 1.9 --- readwrite.cc 26 Feb 2008 16:03:04 -0000 1.10 *************** *** 59,62 **** --- 59,64 ---- dap_connection *conn = (dap_connection *)rc->conn; + rc->lasterror = NULL; + // If there is an outstanding record then return that if we can if (rc->record) *************** *** 91,95 **** int r = rms_getreply(h, 0, NULL, &m); if (r == -1) return -1; ! if (r == 047) return 0; // EOF // if r == -2 then we have a message to process. --- 93,100 ---- int r = rms_getreply(h, 0, NULL, &m); if (r == -1) return -1; ! if (r == 047) { ! rc->lasterror = "EOF"; ! return 0; // EOF ! } // if r == -2 then we have a message to process. |
|
From: Christine C. <chr...@us...> - 2008-02-26 14:21:20
|
Update of /cvsroot/linux-decnet/dnprogs/librms In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18611 Modified Files: readwrite.cc Log Message: Fix a "d'oh" moment where were we returned an error if the buffer was big enough, and data if it was too small ;-) Index: readwrite.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/librms/readwrite.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** readwrite.cc 16 Oct 2005 09:05:25 -0000 1.8 --- readwrite.cc 26 Feb 2008 14:20:57 -0000 1.9 *************** *** 62,66 **** if (rc->record) { ! if (maxlen <= rc->dlen) { memcpy(buf, rc->record, rc->dlen); --- 62,66 ---- if (rc->record) { ! if (maxlen >= rc->dlen) { memcpy(buf, rc->record, rc->dlen); |
|
From: Christine C. <chr...@us...> - 2008-02-26 13:08:01
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17708 Modified Files: dapfs.c dapfs.com dapfs_dap.cc filenames.c filenames.h Log Message: Fix reads & object proxy (properly this time) add SETPROT command to the DAPFS.COM object so we can set the protection on directories before renaming them. Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** dapfs.c 26 Feb 2008 09:51:30 -0000 1.13 --- dapfs.c 26 Feb 2008 13:07:54 -0000 1.14 *************** *** 312,316 **** char vmsname[VMSNAME_LEN]; ! syslog(LOG_DEBUG, "open %s, flags=%x\n", path, fi->flags); h = malloc(sizeof(struct dapfs_handle)); if (!h) --- 312,318 ---- char vmsname[VMSNAME_LEN]; ! if (debug&1) ! fprintf(stderr, "open %s, flags=%x\n", path, fi->flags); ! h = malloc(sizeof(struct dapfs_handle)); if (!h) *************** *** 327,330 **** --- 329,335 ---- int saved_errno = errno; free(h); + + if (!saved_errno) // Catch all...TODO + saved_errno = -ENOENT; return -saved_errno; } *************** *** 354,359 **** if (!h) { res = dapfs_open(path, fi); ! if (!res) return res; } --- 359,365 ---- if (!h) { res = dapfs_open(path, fi); ! if (res) return res; + h = (struct dapfs_handle *)fi->fh; } *************** *** 385,390 **** if (res == -1) res = -errno; ! h->offset += res; return res; } --- 391,399 ---- if (res == -1) res = -errno; + else + h->offset += res; ! if (debug&1) ! fprintf(stderr, "dapfs_read: returning %d\n", res); return res; } *************** *** 399,403 **** if (!h) { res = dapfs_open(path, fi); ! if (!res) return res; } --- 408,412 ---- if (!h) { res = dapfs_open(path, fi); ! if (res) return res; } Index: dapfs.com =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.com,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dapfs.com 27 Oct 2005 08:50:21 -0000 1.3 --- dapfs.com 26 Feb 2008 13:07:55 -0000 1.4 *************** *** 39,45 **** --- 39,47 ---- $ operation=f$edit(f$element(0, " ", command),"UPCASE") $ dirname=f$element(1, " ", command) + $ prot=f$element(2, " ", command) $! $ if operation .eqs. "CREATE" then $goto create_op $ if operation .eqs. "STATFS" then $goto statfs_op + $ if operation .eqs. "SETPROT" then $goto setprot_op $ if operation .nes. "REMOVE" then $goto dir_error $ set file/prot=(o:rwed) 'dirname' *************** *** 65,68 **** --- 67,77 ---- $ goto out $! + $setprot_op: + $! + $ set prot='prot' 'dirname' + $ if $severity .ne. 1 then $goto dir_error + $ write dapfs "OK" + $ goto out + $! $dir_error: $ write dapfs "ERROR" Index: dapfs_dap.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs_dap.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** dapfs_dap.cc 26 Feb 2008 09:51:30 -0000 1.10 --- dapfs_dap.cc 26 Feb 2008 13:07:55 -0000 1.11 *************** *** 86,91 **** return -1; ! strcpy((char *)accessdata.acc_acc, "ROOT"); ! accessdata.acc_accl = 4; np = getnodebyname(node); --- 86,105 ---- return -1; ! ! // Try very hard to get the local username for proxy access. ! // This code copied from libdap for consistency ! char *local_user = cuserid(NULL); ! if (!local_user || local_user == (char *)0xffffffff) ! local_user = getenv("LOGNAME"); ! ! if (!local_user) local_user = getenv("USER"); ! if (local_user) ! { ! strcpy((char *)accessdata.acc_acc, local_user); ! accessdata.acc_accl = strlen((char *)accessdata.acc_acc); ! makeupper((char *)accessdata.acc_acc); ! } ! else ! accessdata.acc_acc[0] = '\0'; np = getnodebyname(node); *************** *** 461,465 **** return ret; from = dirname; - //TODO set prot=RWED on 'from' directory or we can't rename it! } --- 475,478 ---- *************** *** 467,472 **** make_vms_filespec(to, vmsto, 0); - /// TODO this does messes up directory grafts if (from == dirname) { if (vmsto[strlen(vmsto)-1] == '.') strcat(vmsto, "DIR"); --- 480,499 ---- make_vms_filespec(to, vmsto, 0); if (from == dirname) { + + // Set prot=RWED on 'from' directory or we can't rename it. + // Don't regard this as fatal, subsequent calls will return -EPERM + // anyway if it's really wrong. + char setprot[BUFLEN]; + char reply[BUFLEN]; + int len; + + sprintf(setprot, "SETPROT %s O:RWED", vmsfrom); + len = get_object_info(setprot, reply); + if (len != 2) // "OK" + syslog(LOG_WARNING, "dapfs: can't set protection on directory %s", vmsfrom); + + // Fix the TO name too. + // TODO Odd dotting here, not sure why. just work around it for now if (vmsto[strlen(vmsto)-1] == '.') strcat(vmsto, "DIR"); Index: filenames.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/filenames.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** filenames.c 25 Feb 2008 17:20:28 -0000 1.6 --- filenames.c 26 Feb 2008 13:07:55 -0000 1.7 *************** *** 48,52 **** } ! static void makeupper(char *s) { unsigned int i; --- 48,52 ---- } ! void makeupper(char *s) { unsigned int i; *************** *** 89,93 **** if (slashes == 1) { ! sprintf(vmsname, "[]%s", unixname+1); return; } --- 89,93 ---- if (slashes == 1) { ! sprintf(vmsname, "%s", unixname+1); return; } Index: filenames.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/filenames.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** filenames.h 25 Feb 2008 17:20:28 -0000 1.3 --- filenames.h 26 Feb 2008 13:07:55 -0000 1.4 *************** *** 16,17 **** --- 16,18 ---- void make_vms_filespec(const char *unixname, char *vmsname, int full); void make_unix_filespec(char *unixname, char *vmsname); + void makeupper(char *s); |
|
From: Christine C. <chr...@us...> - 2008-02-26 09:51:36
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28160 Modified Files: Makefile dapfs.c dapfs_dap.cc Log Message: Fix cross-directory renames Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile 9 Aug 2007 09:26:54 -0000 1.4 --- Makefile 26 Feb 2008 09:51:30 -0000 1.5 *************** *** 12,15 **** --- 12,16 ---- CFLAGS=-g -I../include + LDFLAGS=-g $(PROG1): $(PROG1OBJS) $(DEPLIBS) Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** dapfs.c 25 Feb 2008 17:41:46 -0000 1.12 --- dapfs.c 26 Feb 2008 09:51:30 -0000 1.13 *************** *** 11,18 **** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ! ****************************************************************************** ! */ /* dapfs via FUSE */ ! // mount -tfuse dapfs#'alpha1"chrissie password"::' /mnt/dap #define _FILE_OFFSET_BITS 64 --- 11,20 ---- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ! ****************************************************************************** ! */ /* dapfs via FUSE */ ! // # mount -tfuse dapfs#'alpha1"chrissie password"::' /mnt/dap ! // or for debugging: ! // # ./dapfs zarqon:: /mnt/vax -odebug #define _FILE_OFFSET_BITS 64 *************** *** 179,183 **** { if (debug&1) ! fprintf(stderr, "dapfs_rename: from: %s to:%d\n", from, to); return dap_rename_file(from, to); } --- 181,185 ---- { if (debug&1) ! fprintf(stderr, "dapfs_rename: from: %s to: %s\n", from, to); return dap_rename_file(from, to); } *************** *** 492,495 **** --- 494,501 ---- return 1; + /* This is only useful when dapfs is run directly and with -odebug */ + if (getenv("DAPFS_DEBUG")) + debug = atoi(getenv("DAPFS_DEBUG")); + // This is the host name ending :: (eg zarqon"chrissie password"::) strcpy(prefix, argv[1]); Index: dapfs_dap.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs_dap.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** dapfs_dap.cc 25 Feb 2008 17:41:46 -0000 1.9 --- dapfs_dap.cc 26 Feb 2008 09:51:30 -0000 1.10 *************** *** 26,29 **** --- 26,30 ---- #include <dirent.h> #include <errno.h> + #include <limits.h> #include <sys/statfs.h> #include <sys/select.h> *************** *** 448,457 **** --- 449,478 ---- char vmsfrom[VMSNAME_LEN]; char vmsto[VMSNAME_LEN]; + char dirname[BUFLEN]; int ret; int size; + struct stat stbuf; + + // If it's a directory then add .DIR to the name + if ( (ret = dapfs_getattr_dap(from, &stbuf))) { + strcpy(dirname, from); + strcat(dirname, ".dir"); + if ( (ret = dapfs_getattr_dap(dirname, &stbuf))) + return ret; + from = dirname; + //TODO set prot=RWED on 'from' directory or we can't rename it! + } make_vms_filespec(from, vmsfrom, 0); make_vms_filespec(to, vmsto, 0); + /// TODO this does messes up directory grafts + if (from == dirname) { + if (vmsto[strlen(vmsto)-1] == '.') + strcat(vmsto, "DIR"); + else + strcat(vmsto, ".DIR"); + } + dap_access_message acc; acc.set_accfunc(dap_access_message::RENAME); *************** *** 464,470 **** } - - // TODO Test this, We may need to split the filespec up into DIR & FILE messages, - // at least for cross-directory renames. dap_name_message nam; nam.set_nametype(dap_name_message::FILESPEC); --- 485,488 ---- *************** *** 488,491 **** --- 506,510 ---- dap_status_message *sm = (dap_status_message *)m; ret = -EPERM; // Default error! + goto end; } } |
|
From: Christine C. <chr...@us...> - 2008-02-25 17:41:52
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7421 Modified Files: dapfs.c dapfs_dap.cc Log Message: Make proxy usage consistent when calling the DAPFS.COM object Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** dapfs.c 25 Feb 2008 17:20:25 -0000 1.11 --- dapfs.c 25 Feb 2008 17:41:46 -0000 1.12 *************** *** 50,54 **** char prefix[BUFLEN]; static char mountdir[BUFLEN]; ! static int debug = 1; static const int RAT_DEFAULT = -1; // Use RMS defaults --- 50,54 ---- char prefix[BUFLEN]; static char mountdir[BUFLEN]; ! static int debug = 0; static const int RAT_DEFAULT = -1; // Use RMS defaults Index: dapfs_dap.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs_dap.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** dapfs_dap.cc 25 Feb 2008 17:20:28 -0000 1.8 --- dapfs_dap.cc 25 Feb 2008 17:41:46 -0000 1.9 *************** *** 79,82 **** --- 79,83 ---- memset(&accessdata, 0, sizeof(accessdata)); + memset(&sockaddr, 0, sizeof(sockaddr)); /* This should always succeed, otherwise we would never get here */ *************** *** 84,89 **** return -1; ! memcpy(accessdata.acc_acc, accessdata.acc_user, accessdata.acc_userl); ! accessdata.acc_accl =accessdata.acc_userl; np = getnodebyname(node); --- 85,90 ---- return -1; ! strcpy((char *)accessdata.acc_acc, "ROOT"); ! accessdata.acc_accl = 4; np = getnodebyname(node); *************** *** 105,109 **** sockaddr.sdn_flags = 0x00; sockaddr.sdn_objnum = 0x00; ! memcpy(sockaddr.sdn_objname, "dapfs", 5); sockaddr.sdn_objnamel = dn_htons(5); memcpy(sockaddr.sdn_add.a_addr, np->n_addr,2); --- 106,110 ---- sockaddr.sdn_flags = 0x00; sockaddr.sdn_objnum = 0x00; ! memcpy(sockaddr.sdn_objname, "DAPFS", 5); sockaddr.sdn_objnamel = dn_htons(5); memcpy(sockaddr.sdn_add.a_addr, np->n_addr,2); |
|
From: Christine C. <chr...@us...> - 2008-02-25 17:20:37
|
Update of /cvsroot/linux-decnet/dnprogs/dapfs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31512 Modified Files: dapfs.c dapfs_dap.cc filenames.c filenames.h Log Message: Fix dapfs_getattr so it works with newer FUSE Index: dapfs.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** dapfs.c 28 Oct 2005 15:14:54 -0000 1.10 --- dapfs.c 25 Feb 2008 17:20:25 -0000 1.11 *************** *** 1,4 **** /****************************************************************************** ! (c) 2005 P.J. Caulfield pa...@ty... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2005-2008 Christine Caulfield chr...@gm... This program is free software; you can redistribute it and/or modify *************** *** 14,18 **** */ /* dapfs via FUSE */ ! // mount -tfuse dapfs#'alpha1"patrick password"::' /mnt/dap #define _FILE_OFFSET_BITS 64 --- 14,18 ---- */ /* dapfs via FUSE */ ! // mount -tfuse dapfs#'alpha1"chrissie password"::' /mnt/dap #define _FILE_OFFSET_BITS 64 *************** *** 49,52 **** --- 49,54 ---- char prefix[BUFLEN]; + static char mountdir[BUFLEN]; + static int debug = 1; static const int RAT_DEFAULT = -1; // Use RMS defaults *************** *** 117,120 **** --- 119,125 ---- off_t offset, struct fuse_file_info *fi) { + if (debug&1) + fprintf(stderr, "dapfs_readdir: %s\n", path); + return dapfs_readdir_dap(path, buf, filler, offset, fi); } *************** *** 124,127 **** --- 129,134 ---- { char vername[strlen(path)+3]; + if (debug&1) + fprintf(stderr, "dapfs_unlink: %s\n", path); sprintf(vername, "%s;*", path); *************** *** 152,155 **** --- 159,165 ---- int len; + if (debug&1) + fprintf(stderr, "dapfs_rmdir: %s\n", path); + /* Try the object first. if that fails then use DAP. This is because the VMS protection on *************** *** 168,171 **** --- 178,183 ---- static int dapfs_rename(const char *from, const char *to) { + if (debug&1) + fprintf(stderr, "dapfs_rename: from: %s to:%d\n", from, to); return dap_rename_file(from, to); } *************** *** 179,182 **** --- 191,197 ---- char fullname[VMSNAME_LEN]; char vmsname[VMSNAME_LEN]; + if (debug&1) + + fprintf(stderr, "dapfs_truncate: %s, %ld\n", path, size); make_vms_filespec(path, vmsname, 0); *************** *** 211,214 **** --- 226,232 ---- char *lastbracket; + if (debug&1) + fprintf(stderr, "dapfs_mkdir: %s\n", path); + make_vms_filespec(path, vmsname, 0); // Ths gives is a name like '[]pjc' which we *************** *** 240,243 **** --- 258,264 ---- long size, free; + if (debug&1) + fprintf(stderr, "dapfs_stafs: %s\n", path); + len = get_object_info("STATFS", reply); if (len <= 0) *************** *** 266,269 **** --- 287,293 ---- char vmsname[VMSNAME_LEN]; + if (debug&1) + fprintf(stderr, "dapfs_mknod: %s\n", path); + if (!S_ISREG(mode)) return -ENOSYS; *************** *** 323,326 **** --- 347,353 ---- struct dapfs_handle *h = (struct dapfs_handle *)fi->fh; + if (debug&1) + fprintf(stderr, "dapfs_read: %s\n", path); + if (!h) { res = dapfs_open(path, fi); *************** *** 400,403 **** --- 427,433 ---- int ret; + if (debug&1) + fprintf(stderr, "dapfs_release: %s\n", path); + if (!h) return -EBADF; *************** *** 414,417 **** --- 444,453 ---- { int res; + + if (debug&1) + fprintf(stderr, "dapfs_getattr: %s\n", path); + + memset(stbuf,0x0, sizeof(*stbuf)); + if (strcmp(path, "/") == 0) { res = stat("/", stbuf); *************** *** 427,430 **** --- 463,468 ---- } } + if (debug&1) + fprintf(stderr, "dapfs_getattr: returning %d\n", res); return res; } *************** *** 454,459 **** return 1; ! // This is the host name ending :: (eg zarqon"patrick password"::) strcpy(prefix, argv[1]); // Make a scratch connection - also verifies the path name nice and early --- 492,498 ---- return 1; ! // This is the host name ending :: (eg zarqon"chrissie password"::) strcpy(prefix, argv[1]); + strcpy(mountdir, argv[2]); // Make a scratch connection - also verifies the path name nice and early Index: dapfs_dap.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/dapfs_dap.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** dapfs_dap.cc 28 Oct 2005 15:14:54 -0000 1.7 --- dapfs_dap.cc 25 Feb 2008 17:20:28 -0000 1.8 *************** *** 1,4 **** /****************************************************************************** ! (c) 2005 P.J. Caulfield pa...@ty... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2005-2008 Christine Caulfield chr...@gm... This program is free software; you can redistribute it and/or modify *************** *** 150,157 **** if (nm->get_nametype() == dap_name_message::FILENAME) { if (strstr(nm->get_namespec(), ".DIR;1")) { stbuf->st_mode |= S_IFDIR; } else { ! stbuf->st_mode &= ~S_IFDIR; } } --- 150,158 ---- if (nm->get_nametype() == dap_name_message::FILENAME) { if (strstr(nm->get_namespec(), ".DIR;1")) { + stbuf->st_mode &= ~S_IFREG; stbuf->st_mode |= S_IFDIR; } else { ! stbuf->st_mode |= S_IFREG; } } Index: filenames.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/filenames.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** filenames.c 16 Oct 2005 14:34:50 -0000 1.5 --- filenames.c 25 Feb 2008 17:20:28 -0000 1.6 *************** *** 1,4 **** /****************************************************************************** ! (c) 2005 P.J. Caulfield pa...@ty... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2005-2008 Christine Caulfield chr...@gm... This program is free software; you can redistribute it and/or modify *************** *** 141,145 **** // Don't get caught out by concatenated filespecs ! // like dua0:[home.patrick.][test] if (enddir && enddir[1] == '[') enddir=strchr(enddir+1, ']'); --- 141,145 ---- // Don't get caught out by concatenated filespecs ! // like dua0:[home.chrissie.][test] if (enddir && enddir[1] == '[') enddir=strchr(enddir+1, ']'); Index: filenames.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dapfs/filenames.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** filenames.h 17 Oct 2005 07:53:14 -0000 1.2 --- filenames.h 25 Feb 2008 17:20:28 -0000 1.3 *************** *** 1,4 **** /****************************************************************************** ! (c) 2005 P.J. Caulfield pa...@ty... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2005-2008 Christine Caulfield chr...@gm... This program is free software; you can redistribute it and/or modify |
|
From: Christine <chr...@us...> - 2008-02-04 15:47:39
|
Update of /cvsroot/linux-decnet/dnprogs/dnroute In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9597 Modified Files: Makefile Log Message: ...and do it properly this time! Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dnroute/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Makefile 4 Feb 2008 15:32:42 -0000 1.11 --- Makefile 4 Feb 2008 15:47:34 -0000 1.12 *************** *** 8,12 **** $(DNROUTE): get_neigh.c send_route.c routing_msg.c csum.c hash.c netlink/libnetlink.a ! $(CC) $(CFLAGS) -o $@ $^ -L../libdnet -Lnetlink -lnetlink $(LIBDNET) netlink/libnetlink.a: --- 8,12 ---- $(DNROUTE): get_neigh.c send_route.c routing_msg.c csum.c hash.c netlink/libnetlink.a ! $(CC) $(CFLAGS) -o $@ $^ -Lnetlink -lnetlink $(LIBDNET) netlink/libnetlink.a: |
|
From: Christine <chr...@us...> - 2008-02-04 15:32:46
|
Update of /cvsroot/linux-decnet/dnprogs/dnroute In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3518 Modified Files: Makefile Log Message: Use $(LIBDNET) rather than -ldnet Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dnroute/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile 9 Aug 2007 09:26:54 -0000 1.10 --- Makefile 4 Feb 2008 15:32:42 -0000 1.11 *************** *** 8,12 **** $(DNROUTE): get_neigh.c send_route.c routing_msg.c csum.c hash.c netlink/libnetlink.a ! $(CC) $(CFLAGS) -o $@ $^ -L../libdnet -Lnetlink -ldnet -lnetlink netlink/libnetlink.a: --- 8,12 ---- $(DNROUTE): get_neigh.c send_route.c routing_msg.c csum.c hash.c netlink/libnetlink.a ! $(CC) $(CFLAGS) -o $@ $^ -L../libdnet -Lnetlink -lnetlink $(LIBDNET) netlink/libnetlink.a: |
|
From: Patrick C. <pa...@us...> - 2008-01-24 09:24:59
|
Update of /cvsroot/linux-decnet/latd/debian In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18624/debian Modified Files: changelog Log Message: Index: changelog =================================================================== RCS file: /cvsroot/linux-decnet/latd/debian/changelog,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** changelog 4 Apr 2007 08:21:36 -0000 1.24 --- changelog 24 Jan 2008 09:24:54 -0000 1.25 *************** *** 1,2 **** --- 1,9 ---- + latd (1.26.2) unstable; urgency=low + + * Fix includes for gcc 4.3 + Closes bug #454886 + + -- Patrick Caulfield <pa...@de...> Sat, 08 Dec 2007 11:09:24 +0000 + latd (1.26.1) unstable; urgency=low |
|
From: Patrick C. <pa...@us...> - 2008-01-09 09:36:30
|
Update of /cvsroot/linux-decnet/dnprogs/dnlogin In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14170/dnlogin Modified Files: tty.c Log Message: Add some more debugging lines Index: tty.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dnlogin/tty.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** tty.c 21 Mar 2006 16:32:01 -0000 1.30 --- tty.c 9 Jan 2008 09:36:27 -0000 1.31 *************** *** 1,4 **** /****************************************************************************** ! (c) 2002-2006 P.J. Caulfield pa...@de... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2002-2008 P.J. Caulfield pa...@de... This program is free software; you can redistribute it and/or modify *************** *** 205,213 **** if (isgraph(buf[i])) { ! DEBUGLOG(DEBUG_FLAG_TTY2, "%c ", buf[i]); } else { ! DEBUGLOG(DEBUG_FLAG_TTY2, "0x%02x ", (unsigned char)buf[i]); } } --- 205,213 ---- if (isgraph(buf[i])) { ! DEBUGLOG(DEBUG_FLAG_TTY2, "%d: %c ", i, buf[i]); } else { ! DEBUGLOG(DEBUG_FLAG_TTY2, "%d: 0x%02x ", i, (unsigned char)buf[i]); } } *************** *** 661,664 **** --- 661,665 ---- if (input_len >= max_read_len) { + DEBUG_TTY("sending buffer, input_len=%d, max_read_len=%d\n", input_len, max_read_len); send_input_buffer(SEND_FLAG_BUFFER_FULL); } |
|
From: Patrick C. <pa...@us...> - 2008-01-09 09:07:36
|
Update of /cvsroot/linux-decnet/dnprogs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2379 Modified Files: Makefile.common Log Message: add $(LIBCRYPT) to static version of LIBDAEMON Index: Makefile.common =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/Makefile.common,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -r1.41 -r1.42 *** Makefile.common 9 Aug 2007 09:26:54 -0000 1.41 --- Makefile.common 9 Jan 2008 09:07:33 -0000 1.42 *************** *** 131,135 **** LIBDNET=-L../libdnet -ldnet LIBDAP=-L../libdap -ldap ! LIBDAEMON=-L../libdaemon -ldnet_daemon DEPLIBDNET=../libdnet/libdnet.so DEPLIBDAEMON=../libdaemon/libdnet_daemon.so --- 131,135 ---- LIBDNET=-L../libdnet -ldnet LIBDAP=-L../libdap -ldap ! LIBDAEMON=-L../libdaemon -ldnet_daemon $(LIBCRYPT) DEPLIBDNET=../libdnet/libdnet.so DEPLIBDAEMON=../libdaemon/libdnet_daemon.so |
|
From: Patrick C. <pa...@us...> - 2008-01-09 09:07:10
|
Update of /cvsroot/linux-decnet/dnprogs/libvaxdata/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1983 Modified Files: convert_vax_data.c convert_vax_data.h is_little_endian.c Removed Files: from_vax_rhdr.c from_vax_rhdr_.c Log Message: Updates from Larry Baker. Index: convert_vax_data.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libvaxdata/src/convert_vax_data.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** convert_vax_data.c 25 Oct 2005 07:32:13 -0000 1.1 --- convert_vax_data.c 9 Jan 2008 09:07:05 -0000 1.2 *************** *** 46,52 **** * ba...@us... * * * ! * Citation: Baker, Lawrence M., 2005, libvaxdata: VAX Data Format Conver- * ! * sion Routines, US Geological Survey, Open-File Report no. * ! * 2005-XXX, nn p. * * * * * --- 46,52 ---- * ba...@us... * * * ! * Citation: Baker, L.M., 2005, libvaxdata: VAX Data Format Conversion * ! * Routines: U.S. Geological Survey Open-File Report 2005- * ! * 1424 (http://pubs.usgs.gov/of/2005/1424/). * * * * * *************** *** 110,113 **** --- 110,115 ---- * macro named LITTLE_ENDIAN. * * 12-Oct-2005 L. M. Baker Remove unreferenced variables. * + * 8-Nov-2005 L. M. Baker Move #define const if not __STDC__ to * + * convert_vax_data.h * * * ******************************************************************************/ *************** *** 179,187 **** #endif - /* const is ANSI C, C++ only */ - #if !defined( __STDC__ ) && !defined( __cplusplus ) - #define const - #endif - #if defined( MAKE_FROM_VAX_R4 ) || defined( MAKE_FROM_VAX_D8 ) || \ defined( MAKE_FROM_VAX_G8 ) || defined( MAKE_FROM_VAX_H16 ) || \ --- 181,184 ---- Index: convert_vax_data.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libvaxdata/src/convert_vax_data.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** convert_vax_data.h 25 Oct 2005 07:32:13 -0000 1.1 --- convert_vax_data.h 9 Jan 2008 09:07:05 -0000 1.2 *************** *** 158,164 **** * ba...@us... * * * ! * Citation: Baker, Lawrence M., 2005, libvaxdata: VAX Data Format Conver- * ! * sion Routines, US Geological Survey, Open-File Report no. * ! * 2005-XXX, nn p. * * * * * --- 158,164 ---- * ba...@us... * * * ! * Citation: Baker, L.M., 2005, libvaxdata: VAX Data Format Conversion * ! * Routines: U.S. Geological Survey Open-File Report 2005- * ! * 1424 (http://pubs.usgs.gov/of/2005/1424/). * * * * * *************** *** 182,185 **** --- 182,187 ---- * 19-Sep-2005 L. M. Baker Add fixups for IEEE-to-VAX conversion * * faults (+-infinity, +-NaN, overflow). * + * 8-Nov-2005 L. M. Baker Move #define const if not __STDC__ from * + * convert_vax_data.c * * * ******************************************************************************/ *************** *** 228,231 **** --- 230,238 ---- #endif + /* const is ANSI C, C++ only */ + #if !defined( __STDC__ ) && !defined( __cplusplus ) + #define const + #endif + void FORTRAN_LINKAGE from_vax_i2( const void *inbuf, void *outbuf, const int *count ); Index: is_little_endian.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libvaxdata/src/is_little_endian.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** is_little_endian.c 25 Oct 2005 07:32:13 -0000 1.1 --- is_little_endian.c 9 Jan 2008 09:07:05 -0000 1.2 *************** *** 17,23 **** * ba...@us... * * * ! * Citation: Baker, Lawrence M., 2005, libvaxdata: VAX Data Format Conver- * ! * sion Routines, US Geological Survey, Open-File Report no. * ! * 2005-XXX, nn p. * * * * * --- 17,23 ---- * ba...@us... * * * ! * Citation: Baker, L.M., 2005, libvaxdata: VAX Data Format Conversion * ! * Routines: U.S. Geological Survey Open-File Report 2005- * ! * 1424 (http://pubs.usgs.gov/of/2005/1424/). * * * * * --- from_vax_rhdr.c DELETED --- --- from_vax_rhdr_.c DELETED --- |
|
From: Patrick C. <pa...@us...> - 2007-12-08 10:54:47
|
Update of /cvsroot/linux-decnet/latd In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24013 Modified Files: circuit.cc clientsession.cc connection.cc latcpcircuit.cc llogincircuit.cc lloginsession.cc localport.cc localportsession.cc queuedsession.cc reversesession.cc serversession.cc services.cc Log Message: Fix includes for gcc 4.3 Index: circuit.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/circuit.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** circuit.cc 17 Mar 2006 13:37:40 -0000 1.4 --- circuit.cc 8 Dec 2007 10:54:34 -0000 1.5 *************** *** 16,19 **** --- 16,20 ---- #include <sys/time.h> #include <unistd.h> + #include <string.h> #include <sstream> Index: clientsession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/clientsession.cc,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** clientsession.cc 17 Mar 2006 13:37:40 -0000 1.28 --- clientsession.cc 8 Dec 2007 10:54:34 -0000 1.29 *************** *** 19,22 **** --- 19,23 ---- #include <unistd.h> #include <termios.h> + #include <string.h> #include <list> #include <cassert> Index: connection.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/connection.cc,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** connection.cc 31 Jan 2007 10:20:37 -0000 1.71 --- connection.cc 8 Dec 2007 10:54:34 -0000 1.72 *************** *** 16,19 **** --- 16,20 ---- #include <sys/time.h> #include <netinet/in.h> + #include <string.h> #include <list> #include <map> Index: latcpcircuit.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/latcpcircuit.cc,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** latcpcircuit.cc 17 Mar 2006 13:37:40 -0000 1.27 --- latcpcircuit.cc 8 Dec 2007 10:54:34 -0000 1.28 *************** *** 16,19 **** --- 16,20 ---- #include <sys/time.h> #include <unistd.h> + #include <string.h> #include <sstream> Index: llogincircuit.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/llogincircuit.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** llogincircuit.cc 17 Mar 2006 13:37:40 -0000 1.11 --- llogincircuit.cc 8 Dec 2007 10:54:34 -0000 1.12 *************** *** 17,20 **** --- 17,21 ---- #include <syslog.h> #include <time.h> + #include <string.h> #include <sstream> Index: lloginsession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/lloginsession.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** lloginsession.cc 17 Mar 2006 13:37:40 -0000 1.13 --- lloginsession.cc 8 Dec 2007 10:54:34 -0000 1.14 *************** *** 19,22 **** --- 19,24 ---- #include <unistd.h> #include <termios.h> + #include <string.h> + #include <list> #include <queue> Index: localport.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/localport.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** localport.cc 17 Mar 2006 13:37:40 -0000 1.15 --- localport.cc 8 Dec 2007 10:54:34 -0000 1.16 *************** *** 19,22 **** --- 19,23 ---- #include <unistd.h> #include <termios.h> + #include <string.h> #include <list> #include <queue> Index: localportsession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/localportsession.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** localportsession.cc 17 Mar 2006 13:37:40 -0000 1.7 --- localportsession.cc 8 Dec 2007 10:54:34 -0000 1.8 *************** *** 19,22 **** --- 19,23 ---- #include <sys/filio.h> #endif + #include <string.h> #include <stdio.h> #include <syslog.h> Index: queuedsession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/queuedsession.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** queuedsession.cc 17 Mar 2006 13:37:40 -0000 1.4 --- queuedsession.cc 8 Dec 2007 10:54:35 -0000 1.5 *************** *** 15,18 **** --- 15,19 ---- #include <sys/types.h> #include <sys/signal.h> + #include <string.h> #include <stdio.h> #include <syslog.h> Index: reversesession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/reversesession.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** reversesession.cc 17 Mar 2006 13:37:40 -0000 1.4 --- reversesession.cc 8 Dec 2007 10:54:35 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- #include <pwd.h> #include <termios.h> + #include <string.h> #include <list> #include <queue> Index: serversession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/serversession.cc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** serversession.cc 4 Apr 2007 08:21:36 -0000 1.21 --- serversession.cc 8 Dec 2007 10:54:35 -0000 1.22 *************** *** 24,27 **** --- 24,28 ---- #include <pwd.h> #include <termios.h> + #include <string.h> #include <list> #include <queue> Index: services.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/services.cc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** services.cc 17 Mar 2006 13:37:40 -0000 1.17 --- services.cc 8 Dec 2007 10:54:35 -0000 1.18 *************** *** 18,21 **** --- 18,22 ---- #include <time.h> #include <netinet/in.h> + #include <string.h> #include <list> #include <string> |
|
From: Patrick C. <pa...@us...> - 2007-12-07 11:05:14
|
Update of /cvsroot/linux-decnet/dnprogs/dncopy In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7789/dncopy Modified Files: dncopy.cc dnetfile.cc dnetfile.h dnetfile_dap.cc file.h unixfile.cc unixfile.h Log Message: Add some consts to get rid of compiler warnings. Index: dncopy.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dncopy.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** dncopy.cc 4 Dec 2006 15:29:18 -0000 1.11 --- dncopy.cc 7 Dec 2007 11:05:02 -0000 1.12 *************** *** 34,38 **** // Prototypes static void usage(char *name, int dntype, FILE *f); ! static file *getFile(char *name, int verbosity); static void get_env_as_args(char **argv[], int &argc, char *env); static void do_options(int argc, char *argv[], --- 34,38 ---- // Prototypes static void usage(char *name, int dntype, FILE *f); ! static file *getFile(const char *name, int verbosity); static void get_env_as_args(char **argv[], int &argc, char *env); static void do_options(int argc, char *argv[], *************** *** 389,393 **** // Run through the file types and return an object that matches the // type of the name we were passed. ! static file *getFile(char *name, int verbosity) { if (dnetfile::isMine(name)) --- 389,393 ---- // Run through the file types and return an object that matches the // type of the name we were passed. ! static file *getFile(const char *name, int verbosity) { if (dnetfile::isMine(name)) Index: dnetfile.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dnetfile.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** dnetfile.cc 4 Dec 2006 15:29:18 -0000 1.8 --- dnetfile.cc 7 Dec 2007 11:05:02 -0000 1.9 *************** *** 31,35 **** // Assume the file name is a DECnet name if it has two consecutive colons in it ! bool dnetfile::isMine(char *name) { if (strstr(name, "::")) --- 31,35 ---- // Assume the file name is a DECnet name if it has two consecutive colons in it ! bool dnetfile::isMine(const char *name) { if (strstr(name, "::")) *************** *** 40,44 **** // Constructor. ! dnetfile::dnetfile(char *n, int verbosity): conn(verbosity) { --- 40,44 ---- // Constructor. ! dnetfile::dnetfile(const char *n, int verbosity): conn(verbosity) { *************** *** 113,117 **** // Open a file for writing ! int dnetfile::open(char *filename,char *mode) { // Add the remote end's directory spec to the filename. --- 113,117 ---- // Open a file for writing ! int dnetfile::open(const char *filename, const char *mode) { // Add the remote end's directory spec to the filename. *************** *** 122,126 **** // Open a file already named ! int dnetfile::open(char *mode) { int real_rfm, real_rat; --- 122,126 ---- // Open a file already named ! int dnetfile::open(const char *mode) { int real_rfm, real_rat; *************** *** 296,300 **** } ! void dnetfile::perror(char *msg) { if (lasterror) --- 296,300 ---- } ! void dnetfile::perror(const char *msg) { if (lasterror) *************** *** 397,401 **** // Return a string telling the user whether we transferred blocks or // records or what. ! char *dnetfile::get_format_name() { switch (transfer_mode) --- 397,401 ---- // Return a string telling the user whether we transferred blocks or // records or what. ! const char *dnetfile::get_format_name() { switch (transfer_mode) Index: dnetfile.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dnetfile.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** dnetfile.h 10 Mar 2006 08:13:16 -0000 1.5 --- dnetfile.h 7 Dec 2007 11:05:02 -0000 1.6 *************** *** 6,28 **** // Is this one of my filenames? ! static bool isMine(char *name); // Constructor and destructor ! dnetfile(char *name, int verbosity); ~dnetfile(); // Stuff overriden from file. virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags); ! virtual int open(char *mode); ! virtual int open(char *basename, char *mode); virtual int close(); virtual int read(char *buf, int len); virtual int write(char *buf, int len); virtual int next(); ! virtual void perror(char *); virtual char *get_basename(int keep_version); virtual char *get_printname(); virtual char *get_printname(char *filename); ! virtual char *get_format_name(); virtual int get_umask(); virtual int set_umask(int mask); --- 6,28 ---- // Is this one of my filenames? ! static bool isMine(const char *name); // Constructor and destructor ! dnetfile(const char *name, int verbosity); ~dnetfile(); // Stuff overriden from file. virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags); ! virtual int open(const char *mode); ! virtual int open(const char *basename, const char *mode); virtual int close(); virtual int read(char *buf, int len); virtual int write(char *buf, int len); virtual int next(); ! virtual void perror(const char *); virtual char *get_basename(int keep_version); virtual char *get_printname(); virtual char *get_printname(char *filename); ! virtual const char *get_format_name(); virtual int get_umask(); virtual int set_umask(int mask); *************** *** 46,50 **** bool isOpen; // Set when we have an open connection bool writing; // if FALSE then we are reading. ! char *lasterror; char errstring[80]; int verbose; --- 46,50 ---- bool isOpen; // Set when we have an open connection bool writing; // if FALSE then we are reading. ! const char *lasterror; char errstring[80]; int verbose; Index: dnetfile_dap.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dnetfile_dap.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** dnetfile_dap.cc 4 Dec 2006 15:29:18 -0000 1.13 --- dnetfile_dap.cc 7 Dec 2007 11:05:02 -0000 1.14 *************** *** 402,406 **** int code = sm->get_code() & 0xFF; int maccode = sm->get_code() >> 12; ! char *err = sm->get_message(); if (verbose > 1) --- 402,406 ---- int code = sm->get_code() & 0xFF; int maccode = sm->get_code() >> 12; ! const char *err = sm->get_message(); if (verbose > 1) Index: file.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/file.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** file.h 10 Mar 2006 08:13:16 -0000 1.4 --- file.h 7 Dec 2007 11:05:02 -0000 1.5 *************** *** 19,33 **** virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags) = 0; ! virtual int open(char *mode) = 0; ! virtual int open(char *basename, char *mode) = 0; virtual int close() = 0; virtual int read(char *buf, int len) = 0; virtual int write(char *buf, int len) = 0; virtual int next() = 0; ! virtual void perror(char *) = 0; virtual char *get_basename(int keep_version) = 0; virtual char *get_printname() = 0; virtual char *get_printname(char *filename) = 0; ! virtual char *get_format_name() = 0; virtual int get_umask() = 0; virtual int set_umask(int mask) = 0; --- 19,33 ---- virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags) = 0; ! virtual int open(const char *mode) = 0; ! virtual int open(const char *basename, const char *mode) = 0; virtual int close() = 0; virtual int read(char *buf, int len) = 0; virtual int write(char *buf, int len) = 0; virtual int next() = 0; ! virtual void perror(const char *) = 0; virtual char *get_basename(int keep_version) = 0; virtual char *get_printname() = 0; virtual char *get_printname(char *filename) = 0; ! virtual const char *get_format_name() = 0; virtual int get_umask() = 0; virtual int set_umask(int mask) = 0; Index: unixfile.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/unixfile.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** unixfile.cc 1 Sep 2005 08:34:39 -0000 1.4 --- unixfile.cc 7 Dec 2007 11:05:02 -0000 1.5 *************** *** 25,29 **** extern "C" char *basename(const char *); ! int unixfile::open(char *mode) { --- 25,29 ---- extern "C" char *basename(const char *); ! int unixfile::open(const char *mode) { *************** *** 51,55 **** // This open routine is called when the output file is a directory (ie a // copy from multiple sources) so we don't need to check for stdin/out. ! int unixfile::open(char *basename, char *mode) { strcpy(printname, filename); --- 51,55 ---- // This open routine is called when the output file is a directory (ie a // copy from multiple sources) so we don't need to check for stdin/out. ! int unixfile::open(const char *basename, const char *mode) { strcpy(printname, filename); *************** *** 159,163 **** } ! void unixfile::perror(char *msg) { ::perror(msg); --- 159,163 ---- } ! void unixfile::perror(const char *msg) { ::perror(msg); *************** *** 229,233 **** // Return a string telling the user whether we transferred blocks or // records or what. ! char *unixfile::get_format_name() { --- 229,233 ---- // Return a string telling the user whether we transferred blocks or // records or what. ! const char *unixfile::get_format_name() { *************** *** 275,279 **** } ! unixfile::unixfile(char *name) { strcpy(filename, name); --- 275,279 ---- } ! unixfile::unixfile(const char *name) { strcpy(filename, name); Index: unixfile.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/unixfile.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** unixfile.h 1 Sep 2005 08:34:39 -0000 1.2 --- unixfile.h 7 Dec 2007 11:05:03 -0000 1.3 *************** *** 3,7 **** { public: ! unixfile(char *name); unixfile(); ~unixfile(); --- 3,7 ---- { public: ! unixfile(const char *name); unixfile(); ~unixfile(); *************** *** 9,23 **** virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags); ! virtual int open(char *mode); ! virtual int open(char *basename, char *mode); virtual int close(); virtual int read(char *buf, int len); virtual int write(char *buf, int len); virtual int next(); ! virtual void perror(char *); virtual char *get_basename(int keep_version); virtual char *get_printname(); virtual char *get_printname(char *filename); ! virtual char *get_format_name(); virtual int get_umask(); virtual int set_umask(int mask); --- 9,23 ---- virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags); ! virtual int open(const char *mode); ! virtual int open(const char *basename, const char *mode); virtual int close(); virtual int read(char *buf, int len); virtual int write(char *buf, int len); virtual int next(); ! virtual void perror(const char *); virtual char *get_basename(int keep_version); virtual char *get_printname(); virtual char *get_printname(char *filename); ! virtual const char *get_format_name(); virtual int get_umask(); virtual int set_umask(int mask); |
|
From: Patrick C. <pa...@us...> - 2007-12-07 11:05:14
|
Update of /cvsroot/linux-decnet/dnprogs/libdap In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7789/libdap Modified Files: connection.cc connection.h logging.cc logging.h protocol.cc protocol.h Log Message: Add some consts to get rid of compiler warnings. Index: connection.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/connection.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** connection.cc 2 Feb 2006 10:52:41 -0000 1.8 --- connection.cc 7 Dec 2007 11:05:03 -0000 1.9 *************** *** 343,347 **** if (buflen == 0) { ! lasterror = "Remote end closed connection"; return false; } --- 343,347 ---- if (buflen == 0) { ! lasterror = (char *)"Remote end closed connection"; return false; } *************** *** 756,760 **** fname[n0] == ' ' || fname[n0] == '\n') { ! lasterror = "File name parse error"; return false; } --- 756,760 ---- fname[n0] == ' ' || fname[n0] == '\n') { ! lasterror = (char *)"File name parse error"; return false; } *************** *** 783,787 **** if (n1 >= MAX_USER) { ! lasterror = "File name parse error"; return false; } --- 783,787 ---- if (n1 >= MAX_USER) { ! lasterror = (char *)"File name parse error"; return false; } *************** *** 811,815 **** if (n1 >= MAX_PASSWORD) { ! lasterror = "File name parse error"; return false; } --- 811,815 ---- if (n1 >= MAX_PASSWORD) { ! lasterror = (char *)"File name parse error"; return false; } *************** *** 839,843 **** if (n1 >= MAX_ACCOUNT) { ! lasterror = "File name parse error"; return false; } --- 839,843 ---- if (n1 >= MAX_ACCOUNT) { ! lasterror = (char *)"File name parse error"; return false; } *************** *** 868,872 **** if (!binadr) { ! lasterror = "Unknown or invalid node name "; return false; } --- 868,872 ---- if (!binadr) { ! lasterror = (char *)"Unknown or invalid node name "; return false; } *************** *** 961,970 **** // Return the text of a connection error ! char *dap_connection::connerror(char *default_msg) { #ifdef DSO_CONDATA struct optdata_dn optdata; unsigned int len = sizeof(optdata); ! char *msg; if (getsockopt(sockfd, DNPROTO_NSP, DSO_DISDATA, --- 961,970 ---- // Return the text of a connection error ! const char *dap_connection::connerror(char *default_msg) { #ifdef DSO_CONDATA struct optdata_dn optdata; unsigned int len = sizeof(optdata); ! const char *msg; if (getsockopt(sockfd, DNPROTO_NSP, DSO_DISDATA, Index: connection.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/connection.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** connection.h 10 Nov 2000 16:32:49 -0000 1.2 --- connection.h 7 Dec 2007 11:05:03 -0000 1.3 *************** *** 84,88 **** bool error_return(char *); ! char *connerror(char *); /* DECnet phase IV limits */ --- 84,88 ---- bool error_return(char *); ! const char *connerror(char *); /* DECnet phase IV limits */ Index: logging.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/logging.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** logging.cc 19 Jun 2001 10:49:18 -0000 1.3 --- logging.cc 7 Dec 2007 11:05:03 -0000 1.4 *************** *** 32,36 **** static bool show_pid = false; ! void init_logging(char *progname, char type, bool pid) { switch (type) --- 32,36 ---- static bool show_pid = false; ! void init_logging(const char *progname, char type, bool pid) { switch (type) *************** *** 52,56 **** } ! static void daplog_stderr(int level, char *fmt, va_list ap) { --- 52,56 ---- } ! static void daplog_stderr(int level, const char *fmt, va_list ap) { *************** *** 64,68 **** // web page for details) or tty13 which is usually the mono monitor // in a framebuffer system. ! static void daplog_mono(int level, char *fmt, va_list ap) { char outbuf[4096]; --- 64,68 ---- // web page for details) or tty13 which is usually the mono monitor // in a framebuffer system. ! static void daplog_mono(int level, const char *fmt, va_list ap) { char outbuf[4096]; *************** *** 81,85 **** } ! void daplog(int level, char *fmt, ...) { va_list ap; --- 81,85 ---- } ! void daplog(int level, const char *fmt, ...) { va_list ap; Index: logging.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/logging.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** logging.h 26 Apr 2000 08:22:02 -0000 1.1.1.1 --- logging.h 7 Dec 2007 11:05:03 -0000 1.2 *************** *** 3,8 **** #include <stdarg.h> ! void init_logging(char *, char, bool); ! void daplog(int level, char *fmt, ...); #define DAPLOG(x) daplog x --- 3,8 ---- #include <stdarg.h> ! void init_logging(const char *, char, bool); ! void daplog(int level, const char *fmt, ...); #define DAPLOG(x) daplog x Index: protocol.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/protocol.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** protocol.cc 14 Oct 2005 12:18:55 -0000 1.14 --- protocol.cc 7 Dec 2007 11:05:03 -0000 1.15 *************** *** 511,515 **** } ! char *dap_message::type_name() { return type_name(msg_type); --- 511,515 ---- } ! const char *dap_message::type_name() { return type_name(msg_type); *************** *** 517,521 **** // Return the message type by name ! char *dap_message::type_name(int msg_type) { static char name[32]; --- 517,521 ---- // Return the message type by name ! const char *dap_message::type_name(int msg_type) { static char name[32]; *************** *** 1352,1356 **** } ! char *dap_status_message::get_message() { // MACCODEs --- 1352,1356 ---- } ! const char *dap_status_message::get_message() { // MACCODEs *************** *** 2122,2127 **** } ! char *dap_date_message::months[]={"JAN", "FEB", "MAR", "APR", "MAY", "JUN", ! "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"}; //------------------------- dap_alloc_message() ------------------------------ --- 2122,2128 ---- } ! const char *dap_date_message::months[]= ! {"JAN", "FEB", "MAR", "APR", "MAY", "JUN", ! "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"}; //------------------------- dap_alloc_message() ------------------------------ *************** *** 2218,2222 **** } ! char *dap_protect_message::get_protection() { static char protstring[60]; --- 2219,2223 ---- } ! const char *dap_protect_message::get_protection() { static char protstring[60]; *************** *** 2258,2262 **** } ! char *dap_protect_message::get_owner() { return owner.get_string(); --- 2259,2263 ---- } ! const char *dap_protect_message::get_owner() { return owner.get_string(); Index: protocol.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/protocol.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** protocol.h 17 Jan 2006 10:42:22 -0000 1.9 --- protocol.h 7 Dec 2007 11:05:03 -0000 1.10 *************** *** 137,142 **** unsigned char get_type(); ! char *type_name(); ! static char *type_name(int); // Message Types; --- 137,142 ---- unsigned char get_type(); ! const char *type_name(); ! static const char *type_name(int); // Message Types; *************** *** 802,806 **** void set_errno(int); void set_rfa(long); ! char *get_message(); --- 802,806 ---- void set_errno(int); void set_rfa(long); ! const char *get_message(); *************** *** 1000,1004 **** ! static char *months[]; static const int NUM_MONTHS = 12; }; --- 1000,1004 ---- ! static const char *months[]; static const int NUM_MONTHS = 12; }; *************** *** 1026,1031 **** int set_protection(char *); ! char *get_owner(); ! char *get_protection(); // In VMS format mode_t get_mode(); // In Unix format --- 1026,1031 ---- int set_protection(char *); ! const char *get_owner(); ! const char *get_protection(); // In VMS format mode_t get_mode(); // In Unix format |
|
From: Patrick C. <pa...@us...> - 2007-12-07 11:05:14
|
Update of /cvsroot/linux-decnet/dnprogs/fal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7789/fal Modified Files: params.h server.cc server.h Log Message: Add some consts to get rid of compiler warnings. Index: params.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/fal/params.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** params.h 17 Jan 2006 11:29:22 -0000 1.3 --- params.h 7 Dec 2007 11:05:03 -0000 1.4 *************** *** 16,20 **** int remote_os; ! char *type_name() { switch(auto_type) --- 16,20 ---- int remote_os; ! const char *type_name() { switch(auto_type) Index: server.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/fal/server.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** server.cc 17 Jan 2006 11:29:22 -0000 1.4 --- server.cc 7 Dec 2007 11:05:03 -0000 1.5 *************** *** 306,310 **** // Return the DAP ACCESS function name ! char *fal_server::func_name(int number) { static char num[32]; --- 306,310 ---- // Return the DAP ACCESS function name ! const char *fal_server::func_name(int number) { static char num[32]; Index: server.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/fal/server.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** server.h 26 Apr 2000 08:22:02 -0000 1.1.1.1 --- server.h 7 Dec 2007 11:05:03 -0000 1.2 *************** *** 22,26 **** void create_access_task(dap_message *m); bool exchange_config(); ! char *func_name(int); dap_connection &conn; --- 22,26 ---- void create_access_task(dap_message *m); bool exchange_config(); ! const char *func_name(int); dap_connection &conn; |
|
From: Patrick C. <pa...@us...> - 2007-12-07 11:05:14
|
Update of /cvsroot/linux-decnet/dnprogs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7789 Modified Files: Makefile Log Message: Add some consts to get rid of compiler warnings. Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** Makefile 28 Feb 2007 17:12:44 -0000 1.29 --- Makefile 7 Dec 2007 11:05:02 -0000 1.30 *************** *** 106,110 **** deb: rm -f Documentation/*~ Documentation/*.bak - rm -f dnlogin/*.o dnlogin/dnlogin dpkg-buildpackage -rfakeroot --- 106,109 ---- |
