1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
dhex (0.69-1) unstable; urgency=medium
.
* New upstream version.
* debian/control: drop Vcs fields.
* Bump standards version to 4.2.1.
* debian/copyright: updated years.
* debian/install and manpages: added.
* debian/rules: disabled install target.
Author: Gürkan Myczko <gurkan@phys.ethz.ch>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2019-01-22
--- dhex-0.69.orig/dhex.1
+++ dhex-0.69/dhex.1
@@ -155,7 +155,7 @@ from an exotic terminal.
.It Fl m Ar markerfile
It is possible in
.Nm
-to set bookmarks and store them in a markerfile for later use. With this parameter, the markerfile is being read at start time, making it unnecesarry to read them later through the gui. Their file format is described in
+to set bookmarks and store them in a markerfile for later use. With this parameter, the markerfile is being read at start time, making it unneceserry to read them later through the gui. Their file format is described in
.Xr dhex_markers 5 .
.It Fl ob od oh oo Ar offset
After loading a file, the cursor is set to 0, and the first page of bytes is being shown on the screen. With one of those parameters it is possible to start at any other location in the file. The cursorposition could be given as a binary number with
@@ -179,11 +179,11 @@ or an octal one with
.Pp
This way, the first few bytes in a file can be skipped, and just the rest can be compared.
.It Fl r Ar searchlog
-When searching from the command line, the offsets are being read from this searchlog. Its format is being decribed in
+When searching from the command line, the offsets are being read from this searchlog. Its format is being described in
.Xr dhex_searchlog 5 .
.It Fl r1 Ar searchlog1
.It Fl r2 Ar searchlog2
-When searching in two files simultanously, the offsets can be read from two different searchlogs.
+When searching in two files simultaneously, the offsets can be read from two different searchlogs.
.It Fl sa sab sh shb Ar string
Instead of setting the cursor offset to an absolute value, it is possible to search for a specific string from the command line. If there is an additional
.Op Fl ob od oh oo Ar offset
@@ -202,7 +202,7 @@ or
can be applied.
.It Fl s1a s1ab s1h s1hb Ar string1
.It Fl s2a s2ab s2h s2hb Ar string2
-In the diff mode, it is possible to search for two strings in two files simultanously.
+In the diff mode, it is possible to search for two strings in two files simultaneously.
.It Fl v
Prints out the version of
.Nm .
@@ -212,7 +212,7 @@ When searching from the command line, wr
.Pp
.It Fl \&w1 Ar searchlog1
.It Fl w2 Ar searchlog2
-When searching in two files simultanously, write the results from both searches into those log files.
+When searching in two files simultaneously, write the results from both searches into those log files.
.El
.Sh USER INTERFACE
.Ss General
@@ -249,11 +249,11 @@ parameter.
.Xr dhex_markers 5
describes the format of the marker files.
.Ss Searching
-Pressing F2 (or its subsitute) will open the Search... screen. Here, a short string can be entered (either in hex, or in ascii). If no logfiles are being selected, the cursor will jump to the next occurance of this search string upon selection of "Go". It can be chosen if the search is supposed to be conducted forward of backwards.
+Pressing F2 (or its subsitute) will open the Search... screen. Here, a short string can be entered (either in hex, or in ascii). If no logfiles are being selected, the cursor will jump to the next occurence of this search string upon selection of "Go". It can be chosen if the search is supposed to be conducted forward of backwards.
.Pp
-To jump to the next occurance, F3 (or its substitute) has to be pressed. To jump to the previous one, F4 has to be pressed. The search itself wraps at the edges of the file, meaning that when it reaches the end, it will start from the beginning and vice versa.
+To jump to the next occurence, F3 (or its substitute) has to be pressed. To jump to the previous one, F4 has to be pressed. The search itself wraps at the edges of the file, meaning that when it reaches the end, it will start from the beginning and vice versa.
.Pp
-Searchlogs are an advanced way of searching: Writing to the searchlog does not jump the cursor from one occurance to the next. Instead, it will write the offsets of all of them into the logfile. Their format is described in
+Searchlogs are an advanced way of searching: Writing to the searchlog does not jump the cursor from one occurence to the next. Instead, it will write the offsets of all of them into the logfile. Their format is described in
.Xr dhex_searchlog 5 .
.Pp
Reading from this searchlog means that the search does not cover the whole file: Only the addresses which have been provided in this file are being searched. Thus it is possible to search for specific changes. Like for example the number of lives stored in the save file of a game.
--- dhex-0.69.orig/main.c
+++ dhex-0.69/main.c
@@ -67,7 +67,7 @@ void helpscreen(char* argv0,int exitval)
fprintf(stderr," -sa, -SA, -sab, -SAB [x] find the ascii string x in file (b=backwards)\n");
fprintf(stderr," -sh, -SH, -shb, -SHB [x] find the hex string x in file (b=backwards)\n");
fprintf(stderr," -r, -R [read searchlog] read the search positions from this searchlog\n");
- fprintf(stderr," -w, -W [write searchlog] write the location of the occurances to this log\n");
+ fprintf(stderr," -w, -W [write searchlog] write the location of the occurences to this log\n");
fprintf(stderr,"\n");
fprintf(stderr,"%s [Parameters] [Filename1] [Filename2]: Diff mode\n",argv0);
fprintf(stderr," -cd, -CD [x] correlate with the minimum difference\n");
@@ -762,8 +762,8 @@ int main(int argc,char** argv)
if (markers) free(markers);
welcomescreen(argv[0]);
} else {
- if (gosearch1) fprintf(stderr,"%lli occurances found in %s\n",search1.occurancesfound,buf1->filename);
- if (gosearch2) fprintf(stderr,"%lli occurances found in %s\n",search2.occurancesfound,buf2->filename);
+ if (gosearch1) fprintf(stderr,"%lli occurences found in %s\n",search1.occurancesfound,buf1->filename);
+ if (gosearch2) fprintf(stderr,"%lli occurences found in %s\n",search2.occurancesfound,buf2->filename);
}
return 0;
}
|
