[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/misc tos-ident-flags.in, 1.5, 1.6

Razvan Musaloiu-E. razvanm at users.sourceforge.net
Thu May 29 13:08:06 PDT 2008


Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5825

Modified Files:
	tos-ident-flags.in 
Log Message:
Use md5 instead of sha1sum for Darwin.


Index: tos-ident-flags.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-ident-flags.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tos-ident-flags.in	14 Jan 2008 14:10:31 -0000	1.5
--- tos-ident-flags.in	29 May 2008 20:08:03 -0000	1.6
***************
*** 17,22 ****
  (my $whoami = `whoami`) =~ s/\s//g;
  (my $hostname = `hostname`) =~ s/\s//g;
! my $uidhash = `echo "$name$time$whoami$hostname" | sha1sum`;
! my $idhash = `echo "$whoami$hostname" | sha1sum`;
  my $uid = ($uidhash =~/^(.{8})/) ? "0x$1" : 0;
  my $id = ($idhash =~/^(.{8})/) ? "0x$1" : 0;
--- 17,28 ----
  (my $whoami = `whoami`) =~ s/\s//g;
  (my $hostname = `hostname`) =~ s/\s//g;
! my ($uidhash, $idhash);
! if( `uname` =~ /Darwin/ ) {
!   $uidhash = `echo "$name$time$whoami$hostname" | md5`;
!   $idhash = `echo "$whoami$hostname" | md5`;
! } else {
!   $uidhash = `echo "$name$time$whoami$hostname" | sha1sum`;
!   $idhash = `echo "$whoami$hostname" | sha1sum`;
! }
  my $uid = ($uidhash =~/^(.{8})/) ? "0x$1" : 0;
  my $id = ($idhash =~/^(.{8})/) ? "0x$1" : 0;



More information about the Tinyos-2-commits mailing list