--- /usr/ports/audio/gnupod/work/gnupod-0.28/src/gnupod_addsong.pl	Sat Mar 15 17:10:22 2003
+++ /usr/local/bin/gnupod_addsong.pl	Wed Jun 25 00:17:29 2003
@@ -1,3 +1,4 @@
+#!/usr/local/bin/perl
 use strict;
 use MP3::Info qw(:all);
 use File::Copy;
@@ -99,7 +100,7 @@
 }
 elsif($ARGV[0] ne "-") { #not from stdin
  for(my $i=0;$i<int(@ARGV);$i++) {
-   $transfered += each_file($ARGV[$i]);
+   $transfered += each_file($ARGV[$i], $i+1);
  }
 }
 else { #stdin code is from Scott Savarese
@@ -120,12 +121,12 @@
 
 sub each_file {
 my ($transfered) = 0;
-my ($filetoadd) = @_;
+my ($filetoadd,$no) = @_;
 
       if(-r $filetoadd && !(-d $filetoadd))
       {
         # print "File $filetoadd should be added\n";
-	 my ($entry, $rnum, $hash, $clp) = mk_entry($filetoadd, $max_id); 
+	 my ($entry, $rnum, $hash, $clp) = mk_entry($filetoadd, $no, $max_id); 
 	 if($entry)
 	{
 	    $hash =~ s/(\\|\^|\$|\||\(|\)|\[|\]|\*|\+|\?|\{|\})/\\\1/g;
@@ -235,8 +236,8 @@
 #creates a line in gnuPodfile format.. 
 sub mk_entry
 {
-my($file, $inf, $info, $tag, $ret, $rand, $i, $clp, $size, $time);
-($file) = @_;
+my($file, $no, $inf, $info, $tag, $ret, $rand, $i, $clp, $size, $time);
+($file, $no) = @_;
 
 $info = get_mp3info($file);
 $tag  = get_mp3tag($file); 
@@ -299,6 +300,8 @@
  { $ret = $ret."year=\"".xmlstring($tag->{YEAR})."\" "; }
  if($tag->{TRACKNUM})
  { $ret = $ret."songnum=\"".xmlstring($tag->{TRACKNUM})."\" "; }
+ else 
+ { $ret = $ret."songnum=\"".$no."\" "; } 
  if($tag->{COMMENT})
  { $ret = $ret."comment=\"".xmlstring($tag->{COMMENT})."\" "; }
  if($tag->{COMPOSER})