diff considers mozilla/security/nss/cmd/pk11util/scripts/pkey a binary file

RESOLVED FIXED in 3.12

Status

NSS
Libraries
RESOLVED FIXED
12 years ago
10 years ago

People

(Reporter: Wan-Teh Chang, Assigned: Julien Pierre)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

(Reporter)

Description

12 years ago
I found that CVS thinks that mozilla/security/nss/cmd/pk11util/scripts/pkey
is a binary file.  To see this, make a change to the file and then say
cvs diff pkey:

$ cvs diff pkey
Enter passphrase for key '/home/wtchang/.ssh/id_dsa':
Index: pkey
===================================================================
RCS file: /cvsroot/mozilla/security/nss/cmd/pk11util/scripts/pkey,v
retrieving revision 1.2
diff -r1.2 pkey
Binary files /tmp/cvsab08ci and pkey differ
(Reporter)

Comment 1

12 years ago
If you open the file 'pkey' in a text editor, you see
some junk characters at the beginning of the file.
Perhaps that's what makes CVS think it's a binary file.
If you do "cvs status pkey", you see that this file
doesn't have the -kb sticky option that a binary file
in CVS should have.
I believe that it is the diff program, not CVS, that thinks these files are 
binary.  You've already observed that cvs stat doesn not show -kb or -ko 
sticky flags.  I think if you checkout the file, copy it, change the copy,
and then locally diff the original with the modified copy, without using 
CVS, and I think you'll see this same error, at least on some platforms.
QA Contact: jason.m.reid → libraries
(Assignee)

Comment 3

10 years ago
I verified Nelson's assertion in comment 2 .
I also checked that deleting the first few lines with the junk characters allows the diff program to realize it's a text file and not binary.
Those characters also confuse vi.

Bob, what are those characters for ? Should they be deleted ?
Assignee: rrelyea → julien.pierre.boogz
Summary: CVS considers mozilla/security/nss/cmd/pk11util/scripts/pkey a binary file → diff considers mozilla/security/nss/cmd/pk11util/scripts/pkey a binary file

Comment 4

10 years ago
I think it's just corrupted. I may actually be the output of saving a key written on top of a script.

I don't see any of the other scripts using pkey, so wither the bad characters or the whole file can be deleted.

bob
(Assignee)

Comment 5

10 years ago
Thanks, Bob. I removed the whole file.

Removing pkey;
/cvsroot/mozilla/security/nss/cmd/pk11util/scripts/pkey,v  <--  pkey
new revision: delete; previous revision: 1.2
done
Status: NEW → RESOLVED
Last Resolved: 10 years ago
Resolution: --- → FIXED
(Reporter)

Updated

10 years ago
Target Milestone: --- → 3.12
You need to log in before you can comment on or make changes to this bug.