Viktor Szakáts napsal(a):
Good, so the command line is fine.
Next question is what happens if the source
filenames were in uppercase, plus whether the
patch command works after above conversion.
Can you test this process?
s...@siki:~/clipp/harbour/source/debug/test_src$ ls
DBUCOPY.PRG DBU.HLP DBUNET.PRG DBUSTRU.PRG DBUVIEW.PRG
DBUEDIT.PRG DBUINDX.PRG DBU.PRG DBUUTIL.PRG
DBUHELP.PRG DBU.LNK DBU.RMK DBUVIEW.BAK
s...@siki:~/clipp/harbour/source/debug/test_src$ hbformat
-lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpaces=no *.prg
Reformatting ./DBUHELP.PRG
<................................................>
Reformatting ./DBUINDX.PRG
<.............................................>
Reformatting ./DBUSTRU.PRG
<.........................................>
Reformatting ./DBUVIEW.PRG
<.........................................>
Reformatting ./DBUUTIL.PRG
<.........................................>
Reformatting ./DBUCOPY.PRG
<.........................................>
Reformatting ./DBU.PRG
<.........................................>
Reformatting ./DBUEDIT.PRG
<.........................................>
Reformatting ./DBUNET.PRG
<............................................>
s...@siki:~/clipp/harbour/source/debug/test_src$ ls
DBU.bak dbuedit.prg DBUINDX.bak dbunet.prg dbustru.prg
DBUVIEW.BAK
DBUCOPY.bak DBUHELP.bak dbuindx.prg dbu.prg DBUUTIL.bak
dbuview.prg
dbucopy.prg dbuhelp.prg DBU.LNK DBU.RMK dbuutil.prg
DBUEDIT.bak DBU.HLP DBUNET.bak DBUSTRU.bak DBUVIEW.bak
s...@siki:~/clipp/harbour/source/debug/test_src$
Thanks. This looks fine to me, hbformat left the
uppercased names as .bak files.
What I don't understand is how hbformat found the *.PRG
extension where we looked for *.prg one. Anyway current
behavior is very good for us, since it accept extension
regardless of the case.
Can you test the 'patch -N -i dbu52.dif' (or dif53.dif)
command, if it finished successfully?
s...@siki:~/clipp/harbour/examples/dbu/test_src$ patch -N -i dbu52.dif
patching file dbu.prg
Hunk #1 FAILED at 60.
Hunk #2 FAILED at 381.
Hunk #3 FAILED at 398.
3 out of 3 hunks FAILED -- saving rejects to file dbu.prg.rej
patching file dbucopy.prg
Hunk #1 FAILED at 104.
Hunk #2 FAILED at 208.
Hunk #3 FAILED at 735.
Hunk #4 FAILED at 750.
Hunk #5 FAILED at 813.
Hunk #6 FAILED at 828.
6 out of 6 hunks FAILED -- saving rejects to file dbucopy.prg.rej
patching file dbuindx.prg
Hunk #1 FAILED at 240.
1 out of 1 hunk FAILED -- saving rejects to file dbuindx.prg.rej
patching file dbustru.prg
Hunk #1 FAILED at 811.
Hunk #2 FAILED at 1215.
Hunk #3 FAILED at 1236.
Hunk #4 FAILED at 1320.
4 out of 4 hunks FAILED -- saving rejects to file dbustru.prg.rej
patching file dbuutil.prg
Hunk #1 FAILED at 2152.
1 out of 1 hunk FAILED -- saving rejects to file dbuutil.prg.rej
patching file dbuview.prg
Hunk #1 FAILED at 1110.
Hunk #2 FAILED at 1141.
Hunk #3 FAILED at 2790.
Hunk #4 FAILED at 2799.
Hunk #5 FAILED at 2841.
Hunk #6 FAILED at 3010.
Hunk #7 FAILED at 3081.
7 out of 7 hunks FAILED -- saving rejects to file dbuview.prg.rej
s...@siki:~/clipp/harbour/examples/dbu/test_src$
huh
Brgds,
Viktor
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
***************
*** 104,110 ****
* DBF for normal mode
files = "dbf_list"
- def_ext = ".DBF"
* when is a filename acceptable?
fi_done = "not_empty('filename')"
--- 104,110 ----
* DBF for normal mode
files = "dbf_list"
+ def_ext = ".dbf"
* when is a filename acceptable?
fi_done = "not_empty('filename')"
***************
*** 208,214 ****
SELECT (M->cur_area)
- IF RAT(M->def_ext, M->filename) = LEN(M->filename) - 3
* target has default extension..does it exists in
current dir?
add_name = .NOT. FILE(name(M->filename) + M->def_ext)
--- 208,214 ----
SELECT (M->cur_area)
+ IF RAT(Lower( M->def_ext ), Lower( M->filename )) =
LEN(M->filename) - 3
* target has default extension..does it exists in
current dir?
add_name = .NOT. FILE(name(M->filename) + M->def_ext)
***************
*** 735,741 ****
cur_el = 1
rel_row = 0
files = "dbf_list"
- def_ext = ".DBF"
filelist(1) && display new list
ELSE
--- 735,741 ----
cur_el = 1
rel_row = 0
files = "dbf_list"
+ def_ext = ".dbf"
filelist(1) && display new list
ELSE
***************
*** 750,756 ****
cur_el = 1
rel_row = 0
files = "txt_list"
- def_ext = ".TXT"
filelist(1) && display new list
ENDIF
--- 750,756 ----
cur_el = 1
rel_row = 0
files = "txt_list"
+ def_ext = ".txt"
filelist(1) && display new list
ENDIF
***************
*** 813,819 ****
cur_el = 1
rel_row = 0
files = "dbf_list"
- def_ext = ".DBF"
filelist(1) && display new list
ELSE
--- 813,819 ----
cur_el = 1
rel_row = 0
files = "dbf_list"
+ def_ext = ".dbf"
filelist(1) && display new list
ELSE
***************
*** 828,834 ****
cur_el = 1
rel_row = 0
files = "txt_list"
- def_ext = ".TXT"
filelist(1) && display new list
ENDIF
--- 828,834 ----
cur_el = 1
rel_row = 0
files = "txt_list"
+ def_ext = ".txt"
filelist(1) && display new list
ENDIF
***************
*** 60,65 ****
SAVE SCREEN && the screen you save...
SET SCOREBOARD OFF && who's keeping score,
anyhow
SET KEY 28 TO && some folks need help
IF (ISCOLOR() .OR. "/C" $ UPPER(param2)) .AND. .NOT. "/M" $ UPPER(param2)
* make it pretty
--- 60,68 ----
SAVE SCREEN && the screen you save...
SET SCOREBOARD OFF && who's keeping score,
anyhow
SET KEY 28 TO && some folks need help
+
+ SET DATE ANSI
+ SET CENTURY ON
IF (ISCOLOR() .OR. "/C" $ UPPER(param2)) .AND. .NOT. "/M" $ UPPER(param2)
* make it pretty
***************
*** 378,390 ****
ENDIF
- CASE FILE(com_line + ".VEW")
* look for file name with .VEW extension
- com_line = com_line + ".VEW"
- CASE FILE(com_line + ".DBF")
* look for file name with .DBF extension
- com_line = com_line + ".DBF"
OTHERWISE
* file not found..ignore command line
--- 381,393 ----
ENDIF
+ CASE FILE(com_line + ".vew")
* look for file name with .VEW extension
+ com_line = com_line + ".vew"
+ CASE FILE(com_line + ".dbf")
* look for file name with .DBF extension
+ com_line = com_line + ".dbf"
OTHERWISE
* file not found..ignore command line
***************
*** 395,401 ****
IF .NOT. EMPTY(com_line)
* command line file exists
- IF RAT(".VEW", com_line) = LEN(com_line) - 3
* assume a valid .VEW file
view_file = com_line
set_from(.F.) && restore view
--- 398,404 ----
IF .NOT. EMPTY(com_line)
* command line file exists
+ IF RAT(".vew", Lower( com_line ) ) = LEN(com_line) - 3
* assume a valid .VEW file
view_file = com_line
set_from(.F.) && restore view
***************
*** 240,246 ****
INDEX ON &k_exp TO &filename
CLOSE INDEX
- IF AT(INDEXEXT(), M->filename) = LEN(M->filename) - 3 .AND.;
FILE(name(M->filename) + INDEXEXT()) .AND. M->add_name
* add only .ntx files in the current directory
--- 240,246 ----
INDEX ON &k_exp TO &filename
CLOSE INDEX
+ IF AT(Lower( INDEXEXT() ), Lower( M->filename )) =
LEN(M->filename) - 3 .AND.;
FILE(name(M->filename) + INDEXEXT()) .AND. M->add_name
* add only .ntx files in the current directory
***************
*** 811,817 ****
is_insert = .F.
filename = stru_name
- IF filebox(".DBF", "dbf_list", "stru_title",;
"do_modstru", .T., 13) <> 0
* structure created or altered
stru_name = filename
--- 811,817 ----
is_insert = .F.
filename = stru_name
+ IF filebox(".dbf", "dbf_list", "stru_title",;
"do_modstru", .T., 13) <> 0
* structure created or altered
stru_name = filename
***************
*** 1215,1221 ****
USE
* remember if file existed in current directory before
- add_name = .NOT. FILE(name(filename) + ".DBF")
IF FILE(filename)
* file exists..modify structure and save old data
--- 1215,1221 ----
USE
* remember if file existed in current directory before
+ add_name = .NOT. FILE(name(filename) + ".dbf")
IF FILE(filename)
* file exists..modify structure and save old data
***************
*** 1236,1246 ****
* establish temp filespec and dbt specs in same
directory
name_temp = SUBSTR(filename, 1, RAT("\", filename)) +;
- "DDBBUUUU.TMP"
dbt_spec = SUBSTR(filename, 1, RAT(".", filename)) +;
- "DBT"
dbt_temp = SUBSTR(name_temp, 1, RAT(".", name_temp)) +;
- "DBT"
IF FILE(dbt_spec)
* data file contains memo fields
--- 1236,1246 ----
* establish temp filespec and dbt specs in same
directory
name_temp = SUBSTR(filename, 1, RAT("\", filename)) +;
+ "ddbbuuuu.tmp"
dbt_spec = SUBSTR(filename, 1, RAT(".", filename)) +;
+ "dbt"
dbt_temp = SUBSTR(name_temp, 1, RAT(".", name_temp)) +;
+ "dbt"
IF FILE(dbt_spec)
* data file contains memo fields
***************
*** 1320,1327 ****
CREATE &filename FROM ddbbuuuu.ext ALIAS cAlias
USE
- IF AT(".DBF", filename) = LEN(filename) - 3 .AND.;
- FILE(name(filename) + ".DBF") .AND. add_name
* add only .dbf files in the current directory
i = afull(dbf_list) + 1
--- 1320,1327 ----
CREATE &filename FROM ddbbuuuu.ext ALIAS cAlias
USE
+ IF AT(".dbf", Lower(filename)) = LEN(filename) - 3
.AND.;
+ FILE(name(filename) + ".dbf") .AND. add_name
* add only .dbf files in the current directory
i = afull(dbf_list) + 1
***************
*** 2152,2158 ****
IF FILE(M->filename)
* only if the file exists
- IF INDEXEXT() = ".NTX"
* Clipper index file format
k_pos = 23
--- 2152,2158 ----
IF FILE(M->filename)
* only if the file exists
+ IF Lower( INDEXEXT() ) = ".ntx"
* Clipper index file format
k_pos = 23
***************
*** 1110,1116 ****
IF .NOT. (RAT(".", M->filename) > RAT("\", M->filename))
* no extension entered..provide default
- filename = M->filename + ".DBF"
ENDIF
--- 1110,1116 ----
IF .NOT. (RAT(".", M->filename) > RAT("\", M->filename))
* no extension entered..provide default
+ filename = M->filename + ".dbf"
ENDIF
***************
*** 1141,1147 ****
ELSE
* insert or enter or menu selection..use filebox
- ret_val = filebox(".DBF", "dbf_list", "dopen_titl",;
"do_opendbf", .F., 8) <> 0
ENDIF
--- 1141,1147 ----
ELSE
* insert or enter or menu selection..use filebox
+ ret_val = filebox(".dbf", "dbf_list", "dopen_titl",;
"do_opendbf", .F., 8) <> 0
ENDIF
***************
*** 2790,2796 ****
* get user entered file name..will default to primary + ".VEW"
IF EMPTY(M->view_file) .AND. .NOT. EMPTY(dbf[1])
* default to name of primary data file
- filename = name(dbf[1]) + ".VEW"
ELSE
* whatever the last view was
--- 2790,2796 ----
* get user entered file name..will default to primary + ".VEW"
IF EMPTY(M->view_file) .AND. .NOT. EMPTY(dbf[1])
* default to name of primary data file
+ filename = name(dbf[1]) + ".vew"
ELSE
* whatever the last view was
***************
*** 2799,2805 ****
ENDIF
* it's better in a box
- filebox(".VEW", "vew_list", "vcrea_titl", "do_creavew", .T., 8)
* restore help code
help_code = M->old_help
--- 2799,2805 ----
ENDIF
* it's better in a box
+ filebox(".vew", "vew_list", "vcrea_titl", "do_creavew", .T., 8)
* restore help code
help_code = M->old_help
***************
*** 2841,2847 ****
stat_msg("Generating View File")
* add new .VEW files to vew_list if created in current directory only
- add_name = .NOT. FILE(name(filename) + ".VEW")
* create structure extended template
CREATE ddbbuuuu.ext
--- 2841,2847 ----
stat_msg("Generating View File")
* add new .VEW files to vew_list if created in current directory only
+ add_name = .NOT. FILE(name(filename) + ".vew")
* create structure extended template
CREATE ddbbuuuu.ext
***************
*** 3010,3017 ****
USE
* add file name to array of view files
- IF AT(".VEW", filename) = LEN(filename) - 3 .AND.;
- FILE(name(filename) + ".VEW") .AND. add_name
* add only new .VEW files in the current directory
* determine number of first empty element
--- 3010,3017 ----
USE
* add file name to array of view files
+ IF AT(".vew", Lower(filename)) = LEN(filename) - 3 .AND.;
+ FILE(name(filename) + ".vew") .AND. add_name
* add only new .VEW files in the current directory
* determine number of first empty element
***************
*** 3081,3087 ****
IF M->from_view
* called from set_view
- IF filebox(".VEW", "vew_list", "vopen_titl", "do_openvew", .F., 8) <> 0
* indicate new View has been set
keystroke = 13
--- 3081,3087 ----
IF M->from_view
* called from set_view
+ IF filebox(".vew", "vew_list", "vopen_titl", "do_openvew", .F., 8) <> 0
* indicate new View has been set
keystroke = 13
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
