[Tinyos-commits] CVS: tinyos-1.x/tools/scripts ident_flags, 1.4, 1.5 write_tos_image, 1.5, 1.6

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tools/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9411

Modified Files:
	ident_flags write_tos_image 
Log Message:
No longer rely on raw bytes to initialize fields for Ident. Also
cleans up the command line when compiling since the explicit bytes are
no longer passed.



Index: ident_flags
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/scripts/ident_flags,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ident_flags	17 May 2005 20:38:34 -0000	1.4
--- ident_flags	21 Jun 2005 23:28:19 -0000	1.5
***************
*** 26,31 ****
    substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
    my @bytes = unpack( "C*", $qname );
!   push( @defs, "-DIDENT_PROGRAM_NAME=\"$qname\"" );
!   push( @defs, '-DIDENT_PROGRAM_NAME_BYTES="' . join(",", at bytes) . ',0"' );
  }
  if( defined $whoami && $whoami !~ /^\s*$/ ) {
--- 26,30 ----
    substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
    my @bytes = unpack( "C*", $qname );
!   push( @defs, "-DIDENT_PROGRAM_NAME=\\\"$qname\\\"" );
  }
  if( defined $whoami && $whoami !~ /^\s*$/ ) {
***************
*** 33,38 ****
    substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
    my @bytes = unpack( "C*", $qname );
!   push( @defs, "-DIDENT_USER_ID=\"$qname\"" );
!   push( @defs, '-DIDENT_USER_ID_BYTES="' . join(",", at bytes) . ',0"' );
  }
  if( defined $hostname && $hostname !~ /^\s*$/ ) {
--- 32,36 ----
    substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
    my @bytes = unpack( "C*", $qname );
!   push( @defs, "-DIDENT_USER_ID=\\\"$qname\\\"" );
  }
  if( defined $hostname && $hostname !~ /^\s*$/ ) {
***************
*** 40,45 ****
    substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
    my @bytes = unpack( "C*", $qname );
!   push( @defs, "-DIDENT_HOSTNAME=\"$qname\"" );
!   push( @defs, '-DIDENT_HOSTNAME_BYTES="' . join(",", at bytes) . ',0"' );
  }
  push( @defs, "-DIDENT_USER_HASH=${id}L" );
--- 38,42 ----
    substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
    my @bytes = unpack( "C*", $qname );
!   push( @defs, "-DIDENT_HOSTNAME=\\\"$qname\\\"" );
  }
  push( @defs, "-DIDENT_USER_HASH=${id}L" );

Index: write_tos_image
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/scripts/write_tos_image,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** write_tos_image	21 Jun 2005 08:49:55 -0000	1.5
--- write_tos_image	21 Jun 2005 23:28:19 -0000	1.6
***************
*** 23,27 ****
      $ident_flags{lc($1)} = uc($2);
    }
!   elsif ($arg =~ /^-DIDENT_(.+)=(.+)$/) {
      $ident_flags{lc($1)} = $2;
    }
--- 23,27 ----
      $ident_flags{lc($1)} = uc($2);
    }
!   elsif ($arg =~ /^-DIDENT_(.+)="(.+)"$/) {
      $ident_flags{lc($1)} = $2;
    }