patchfs, audio update
- From: Adam Byrtek 'alpha' <alpha student uci agh edu pl>
- To: Pavel Roskin <proski gnu org>
- Cc: "Andrew V. Samoilov" <sav bcs zp ua>, mc-devel gnome org
- Subject: patchfs, audio update
- Date: Fri, 13 Dec 2002 03:01:24 +0100
2002-12-13 Adam Byrtek <alpha debian org>
* extfs/patchfs.in: Copyin method added (with compressed files
support). Files inside archive now have '.diff' extension.
Temporary file not needed any more. Proper handling of
"/dev/null" filenames, filename heuristics based on diff info
page. Set files owner and group as the archive.
* extfs/audio.in: CDDB_TIMEOUT variable added. Small fix.
Changelog entry attached in patch as Pavel requested.
Andrew, if you are interested I won't play with context format. I've
tried, and realized it would take quite a lot of effort and make the
code ugly. In fact nearly every project uses unified diffs as a
standard for patches, even the diff/patch info page advises to use
unified, so IMHO good unified extfs is better that unstable but
universal.
Andrew:
> Another good change should be to use +++ filename for newly created
> files (--- /dev/null).
I've choosen to include PATCH-CREATE and PATCH-REMOVE virual
directories. It's better.
Pavel:
> I suggest that we select the shorter filename unless it's /dev/null.
> Usually the longer filename has ".orig" or ".new" is it.
Had some problems with this solution, so I've looked up official
information on diff info-page. Now it uses the same heuristics as
patch (only without 'Index:' field).
> Also it would be nice to add ".diff" to all filenames. It would force
> correct syntax highlighting in the editor and it's more convenient if
Of course, true. Applied. It created problem with 'infinite recursion':
xxx.diff#patchfs:file.diff#patchfs:file.diff#patchfs:file.diff........
But it isn't critical. Dont' know how to fix it...
Regards
--
_.|._ |_ _. : Adam Byrtek, alpha@(irc.pl|debian.org)
(_|||_)| |(_| : gg 1802819, pgp 0xB25952C0
| : jid alpha.jabberpl.org
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/mc/vfs/ChangeLog,v
retrieving revision 1.550
diff -u -r1.550 ChangeLog
--- ChangeLog 12 Dec 2002 09:39:46 -0000 1.550
+++ ChangeLog 13 Dec 2002 02:00:33 -0000
@@ -1,3 +1,13 @@
+2002-12-13 Adam Byrtek <alpha debian org>
+
+ * extfs/patchfs.in: Copyin method added (with compressed files
+ support). Files inside archive now have '.diff' extension.
+ Temporary file not needed any more. Proper handling of
+ "/dev/null" filenames, filename heuristics based on diff info
+ page. Set files owner and group as the archive.
+
+ * extfs/audio.in: CDDB_TIMEOUT variable added. Small fix.
+
2002-12-12 Pavel Roskin <proski gnu org>
* extfs/urar.in: Strengthen quoting. Don't use full path to rar
Index: extfs/audio.in
===================================================================
RCS file: /cvs/gnome/mc/vfs/extfs/audio.in,v
retrieving revision 1.3
diff -u -r1.3 audio.in
--- extfs/audio.in 12 Dec 2002 07:41:39 -0000 1.3
+++ extfs/audio.in 13 Dec 2002 02:00:33 -0000
@@ -10,7 +10,7 @@
CDDB_SERVER="http://freedb.freedb.org";
CDDB_HANDSHAKE="hello=user+localhost+mc+1.0&proto=1"
-
+CDDB_TIMEOUT=20 # in seconds
audiofs_list ()
{
@@ -32,8 +32,8 @@
if [ -z "$DISCID" ]; then
exit 1
fi
- RESPONSE=`wget -q -T 60 -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+query+$DISCID&$CDDB_HANDSHAKE" | @AWK@ '/^200/ { print $2,$3; }'`
- wget -q -T 60 -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" > $3
+ RESPONSE=`wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+query+$DISCID&$CDDB_HANDSHAKE" | tee $3 | @AWK@ '/^200/ { print $2,$3; }'`
+ wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" >> $3
else
TRACK=`echo $2 | sed 's/track-0*//' | sed 's/\.wav//'`
cdparanoia -q -d $1 $TRACK $3 >/dev/null
Index: extfs/patchfs.in
===================================================================
RCS file: /cvs/gnome/mc/vfs/extfs/patchfs.in,v
retrieving revision 1.4
diff -u -r1.4 patchfs.in
--- extfs/patchfs.in 12 Dec 2002 16:13:20 -0000 1.4
+++ extfs/patchfs.in 13 Dec 2002 02:00:33 -0000
@@ -9,145 +9,208 @@
use POSIX;
# standard binaries
-my $bzcat = "bzip2 -dc";
-my $gzcat = "zcat";
+my $bzip = "bzip2";
+my $gzip = "gzip";
my $file = "file";
# date parsing requires Date::Parse from TimeDate module
my $parsedates = eval "require Date::Parse";
+
+# output unix date in a mc-readable format
sub timef
{
- # format unix time
my @time=localtime($_[0]);
- return sprintf "%02d-%02d-%d %02d:%02d", $time[4]+1, $time[3],
- $time[5] + 1900, $time[2], $time[1];
+ return sprintf "%02d-%02d-%02d %02d:%02d", $time[4]+1, $time[3], $time[5]%100, $time[2], $time[1];
}
+# parse given string as a date and return unix time
sub datetime
{
# in case of problems fall back to 0 in unix time
# note: str2time interprets some wrong values (eg. " ") as 'today'
if ($parsedates && defined (my $t=str2time($_[0]))) {
- return timef($t);
+ return timef($t)
}
- return timef(time);
+ return timef(0);
+}
+
+# print message on stderr and exit
+sub error
+{
+ print STDERR $_[0];
+ exit 1;
}
+# list files affected by patch
sub list
{
- my ($f,$d,$state,$pos,$npos);
- my ($uid,$gid)=(`id -nu` || "0",`id -ng` || "0");
- chomp ($uid, $gid);
+ my ($archive)= _;
+ my ($state,$pos,$npos,$time);
+ my ($f,$fsrc,$fdst,$prefix);
+
+ # use uid and gid from file
+ my ($uid,$gid)=(`ls -l $archive`=~/^[^\s]+\s+[^\s]+\s+([^\s]+)\s+([^\s]+)/);
import Date::Parse if ($parsedates);
# state==1 means diff contents, state==0 mens comments
- $state=1;
- $f="";
+ $state=1; $f="";
while (<I>) {
- if (/^--- /) {
- # start of a new file
+ if (/^-{3} /) {
+ # parse diff header
if ($state==1) {
$npos=tell(I)-length;
- printf "-rw-r--r-- 1 %s %s %d %s %s\n", $uid, $gid, $npos-$pos, datetime($d), $f
+ printf "-rw-r--r-- 1 %s %s %d %s %s%s\n", $uid, $gid, $npos-$pos, datetime($time), $prefix, $f
if $f;
$pos=$npos;
}
$state=1;
- s/^--- ([^\s]+).*$/$1/;
- chomp;
- $f=$_;
- $d="";
- } elsif (/^\+\+\+ /) {
- # take date from the +++ field
- s/^\+\+\+ ([^\s]+)\s*//;
- s/^([^\t]+).*$/$1/;
- chomp;
- $d=$_;
+
+ error "Can't parse unified diff header"
+ unless ((($_.=<I>).=<I>)=~/^\-{3} .*\n\+{3} .*\n@@ .* @@\n$/);
+ ($fsrc)=/^-{3} ([^\s]+).*\n.*\n.*\n$/;
+ ($fdst)=/^.*\n\+{3} ([^\s]+).*\n.*\n$/;
+ ($time)=/^.*\n\+{3} [^\s]+\s+([^\t\n]+).*\n.*\n$/;
+
+ # select filename, conform with (diff.info)Multiple patches
+ $prefix="";
+ if ($fsrc eq "/dev/null") {
+ $f=$fdst; $prefix="PATCH-CREATE/";
+ } elsif ($fdst eq "/dev/null") {
+ $f=$fsrc; $prefix="PATCH-REMOVE/";
+ } elsif (($fdst eq "/dev/null") && ($fsrc eq "/dev/null")) {
+ error "Malformed diff";
+ } elsif (!$fdst && !$fsrc) {
+ error "Index: not yet implemented";
+ } else {
+ # fewest path name components
+ if ($fdst=~s|/|/|g < $fsrc=~s|/|/|g) {
+ $f=$fdst;
+ } elsif ($fdst=~s|/|/|g > $fsrc=~s|/|/|g) {
+ $f=$fsrc;
+ } else {
+ # shorter base name
+ if (($fdst=~m|^.*/([^/]+)$|,length $1) < ($fsrc=~m|^.*/([^/]+)$|,length $1)) {
+ $f=$fdst;
+ } elsif (($fdst=~m|^.*/([^/]+)$|,length $1) > ($fsrc=~m|^.*/([^/]+)$|,length $1)) {
+ $f=$fsrc;
+ } else {
+ # shortest names
+ if (length $fdst < length $fsrc) {
+ $f=$fdst;
+ } else {
+ $f=$fsrc;
+ }
+ }
+ }
+ }
+ $f=$f.".diff";
+
} elsif ($state==1 && !/^([+\- ]|@@)/) {
# start of comments, end of diff contents
$npos=tell(I)-length;
- printf "-rw-r--r-- 1 %s %s %d %s %s\n", $uid, $gid, $npos-$pos, datetime($d), $f
+ printf "-rw-r--r-- 1 %s %s %d %s %s%s\n", $uid, $gid, $npos-$pos, datetime($time), $prefix, $f
if $f;
$pos=$npos;
$state=0;
}
}
$npos=tell(I);
- printf "-rw-r--r-- 1 %s %s %d %s %s\n", $uid, $gid, $npos-$pos, datetime($d), $f
- if $f && $state!=0;
-
- close I;
+ printf "-rw-r--r-- 1 %s %s %d %s %s%s\n", $uid, $gid, $npos-$pos, datetime($time), $prefix, $f
+ if $f;
}
sub copyout
{
my ($file,$out)= _;
- my ($f,$state,$pos);
+ my ($fsrc,$fdst,$found,$state,$buf);
- open O, "> $out";
- $state=1;
- $f="";
+ $file=~s/^(PATCH-(CREATE|REMOVE)\/)?(.*)\.diff$/$3/;
+
+ # state==1 means diff contents, state==0 mens comments
+ $state=1; $found=0; $buf="";
while (<I>) {
- if (/^--- /) {
- # start of a new file
- if ($state==1) {
- if ($f eq $file) {
- seek(I,-length,1);
- last;
- }
- $pos=tell(I)-length;
- }
+ if (/^-{3} /) {
+ # parse diff header
+ last if ($state==1 && $found);
$state=1;
- s/^--- ([^\s]+).*$/$1/;
- chomp;
- $f=$_;
+
+ error "Can't parse unified diff header"
+ unless ((($_.=<I>).=<I>)=~/^\-{3} .*\n\+{3} .*\n@@ .* @@\n$/);
+ ($fsrc)=/^-{3} ([^\s]+).*\n.*\n.*\n$/;
+ ($fdst)=/^.*\n\+{3} ([^\s]+).*\n.*\n$/;
+ $found=1 if (($fsrc eq $file) || ($fdst eq $file));
+
} elsif ($state==1 && !/^([+\- ]|@@)/) {
# start of comments, end of diff contents
- if ($f eq $file) {
- seek(I,-length,1);
- last;
- }
- $pos=tell(I)-length;
+ last if ($found);
$state=0;
+ $buf="";
}
+ $buf.=$_ if ($found || $state==0)
}
- if ($f eq $file) {
- my $here=tell(I);
- seek(I,$pos,0);
- read(I,my $buf,$here-$pos);
+ if ($found) {
+ open O, "> $out";
print O $buf;
+ close O;
}
+}
- close O;
+sub copyin
+{
+ # append diff to archive
+ my ($archive,$name,$f)=(quotemeta $_[0],$_[1],quotemeta $_[2]);
+ my ($cmd);
+
+ error "File must have .diff or .patch extension"
+ unless $name=~/\.(diff|patch)(\.(bz|bz2|gz|z|Z))?$/;
+
+ $_=`$file $f`;
+ if (/bzip/) {
+ $cmd="$bzip -dc $f";
+ } elsif (/gzip/) {
+ $cmd="$gzip -dc $f";
+ } else {
+ $cmd="cat $f";
+ }
+
+ $_=`$file $archive`;
+ if (/bzip/) {
+ system "$cmd | $bzip -c >> $archive";
+ } elsif (/gzip/) {
+ system "$cmd | $gzip -c >> $archive";
+ } else {
+ system "$cmd >> $archive";
+ }
}
+sub openread
+{
+ # open (compressed) archive for reading
+ my ($archive) = (quotemeta $_[0]);
-my $tmp;
-my $quoted_name = quotemeta $ARGV[1];
-$_=`$file $quoted_name`;
-if (/bzip/) {
- $tmp=tmpnam();
- system "$bzcat $quoted_name > $tmp";
- open I, "< $tmp";
-} elsif (/gzip/) {
- $tmp=tmpnam();
- system "$gzcat $quoted_name > $tmp";
- open I, "< $tmp";
-} else {
- open I, "< $ARGV[1]";
+ $_=`$file $archive`;
+ if (/bzip/) {
+ open I, "$bzip -dc $ARGV[1] |";
+ } elsif (/gzip/) {
+ open I, "$gzip -dc $ARGV[1] |";
+ } else {
+ open I, "< $ARGV[1]";
+ }
}
+
if ($ARGV[0] eq "list") {
- list;
- exit(0);
+ openread $ARGV[1];
+ list $ARGV[1];
+ exit 0;
} if ($ARGV[0] eq "copyout") {
+ openread $ARGV[1];
copyout ($ARGV[2], $ARGV[3]);
- exit(0);
-}
-exit(1);
-
-END {
- system "rm $tmp" if ($tmp);
+ exit 0;
+} if ($ARGV[0] eq "copyin") {
+ copyin ($ARGV[1], $ARGV[2], $ARGV[3]);
+ exit 0;
}
+exit 1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
