FCB: Rename should support asterisk wildcards #42

andrewbird · 2018-11-20T13:25:42Z

Since DOS 3.0 the FCB rename function int21/17 supports asterisk
wildcards. Add a function to expand the '*' into '?' to fill the
remaining buffer.

This changes FDPP to behave the same as PC-DOS, MS-DOS and DR-DOS for both FAT and redirector based filesystems.

Style questions:

I may need to add something similar for int21/13 Delete, do you prefer squashing with this into a single patch?
Do you prefer four calls to FcbExpandAsterisks(), one with duplication inside the function, or two calls to function that handles filename and extension?

andrewbird · 2018-11-20T13:35:30Z

I added a tweak to see if you prefer the function this way?

stsp · 2018-11-20T14:45:34Z

kernel/fcbfns.c

+  int i, afound;
+
+  for (i = 0, afound = 0; i < len; i++) {
+    if (p[i] == '*' || afound) {


But does this properly handle, say, a*.b*?
Or a*.bat*?
I mean, you don't seem to be handling dot, which
may have a separate wildcard.
Also not sure if the cases like *a.*t are valid?
I think the code should be if (p[i] == '*' || (afound && p[i] == ' ')) {
or something like that.

The page I linked to in the commit explains better, but essentially it's very simple and not rich like unix wildcards.
so
*a.b* ==> ???????.b??
a*.bat* is illegal
*a.*t -> ????????.???

There's no dot as the input is an FCB name (8+3 chars, no dot, no \0).

stsp · 2018-11-20T14:48:30Z

Do you prefer four calls to FcbExpandAsterisks(), one with duplication inside the function,
or two calls to function that handles filename and extension?

If you pass start and length, then why you need more
than one func?
By the way, what is it, a freedos bug? It wasn't there?

andrewbird · 2018-11-20T14:58:06Z

I prefer the second commit now, as it reads better in the caller and will be useful for FCB delete too.

Yep it's a freedos bug(or unimplemented feature), but I gave up reporting things as nobody is interested there.

stsp · 2018-11-20T15:21:26Z

OK, please squash then.
Its a bit strange to add and change the
code in a subsequent commits.

andrewbird · 2018-11-20T15:27:55Z

Its a bit strange to add and change the
code in a subsequent commits.

Yes it was a 'pick one' you like moment. As I changed my mind during the writing of the style question, seems obvious now 😄

Since DOS 3.0 the FCB rename function int21/17 supports asterisk wildcards. Add a function to expand the '*' into '?' to fill the remaining buffer. This expansion is very simple as described in the following article: https://blogs.msdn.microsoft.com/oldnewthing/20071217-00/?p=24143/ Just in case the article ever disappears, here's the salient part: 1/ Start with eleven spaces and the cursor at position 1. 2/ Read a character from the input. If the end of the input is reached, then stop. 3/ If the next character in the input is a dot, then set positions 9, 10, and 11 to spaces, move the cursor to position 9, and go back to step 2. 4/ If the next character in the input is an asterisk, then fill the rest of the pattern with question marks, move the cursor to position 12, and go back to step 2. (Yes, this is past the end of the pattern.) 5/ If the cursor is not at position 12, copy the input character to the cursor position and advance the cursor. 6/ Go to step 2.

stsp · 2018-11-20T17:15:23Z

kernel/fcbfns.c

 UBYTE FcbRename(xfcb FAR * lpXfcb)
 {
  rfcb FAR *lpRenameFcb;
  COUNT FcbDrive;
  UBYTE result = FCB_SUCCESS;
  void FAR *lpOldDta = dta;

+  /* DOS 3.0+ allows * wildcards for rename */
+  rfcb FAR *trfcb = (rfcb FAR *)lpXfcb;


Why is such cast?
Are these structs compatible?

Actually the pointer passed into FcbRename should be an rfcb *, but it's pushed through a generic parsing routine to get the first filename extracted as they are initially compatible. Later they cast it back to get to the second part of the structure. All pretty horrid if you ask me.

There seem to be the GetNameField() in fcbfns.c,
which does similar to what you do?

Seems to be operating with asciiz strings, we have 11 chars, no dot, and no terminator.

It seems to be very generic: has nFieldSize for
non-asciiz. And more importantly, it is called from
FcbParseFname(), which, in turn, is called from
FcbRename()!

If that's all working then perhaps it's just the destination pattern that's not being expanded?

I bet.
Plus in this case you likely need to not only
expand, but also match with the from_name,
so that there no ? in the to_name at the end.

stsp · 2018-12-11T17:18:55Z

So could you please convert this to the bug-report
with a test-case then? I'll take a look when time permits.

andrewbird · 2018-12-11T18:30:44Z

Sure, I lost interest in fixing FreeDOS/FDPP stuff. Here's the test case source, and you'll need to assemble for each test with the fn1,fe1,fn2,fe2 updated accordingly as it doesn't handle command line args.

.text                                                                           
.code16                                                                         
                                                                                
    .globl  _start16                                                            
_start16:                                                                       
                                                                                
    push    %%cs                                                                
    pop     %%ds                                                                
                                                                                
    movw    $0x1700, %%ax                                                       
    movw    $fcb, %%dx                                                          
    int     $0x21                                                               
                                                                                
    cmpb    $0, %%al                                                            
    je      prsucc                                                              
                                                                                
prfail:                                                                         
    movw    $failmsg, %%dx                                                      
    jmp     1f                                                                  
prsucc:                                                                         
    movw    $succmsg, %%dx                                                      
1:                                                                              
    movb    $0x9, %%ah                                                          
    int     $0x21                                                               
                                                                                
exit:                                                                           
    movb    $0x4c, %%ah                                                         
    int     $0x21                                                               
                                                                                
fcb:                                                                            
    .byte   0       # 0 default drive                                           
fn1:                                                                            
    .ascii  "% -8s"    # 8 bytes                                                
fe1:                                                                            
    .ascii  "% -3s"    # 3 bytes                                                
wk1:                                                                            
    .space  5                                                                   
fn2:                                                                            
    .ascii  "% -8s"    # 8 bytes                                                
fe2:                                                                            
    .ascii  "% -3s"    # 3 bytes                                                
wk2:                                                                            
    .space  16                                                                  
                                                                                
succmsg:                                                                        
    .ascii  "Rename Operation Success$"                                         
failmsg:                                                                        
    .ascii  "Rename Operation Failed$"

Test one:

            fn1 = "*"                                                           
            fe1 = "in"                                                          
            fn2 = "*"                                                           
            fe2 = "out"                                                         
            create the following files "one.in", "two.in", "three.in", "four.in", "five.in", "none.ctl"
  Run test:
            check "one.out, "two.out", "three.out", "four.out", "five.out", "none.ctl" are present

Test two:

            fn1 = "a*"                                                          
            fe1 = "*"                                                           
            fn2 = "b*"                                                          
            fe2 = "out"                                                         
            create "aone.in", "atwo.in", "athree.in", "afour.in", "afive.in", "xnone.ctl"
  Run test:
            check "bone.out", "btwo.out", "bthree.out", "bfour.out", "bfive.out", "xnone.ctl" are present

Test three:

            fn1 = "abc0??"                                                      
            fe1 = "*"                                                           
            fn2 = "???6*"                                                       
            fe2 = "*"                                                           
            create "abc001.txt", "abc002.txt", "abc003.txt", "abc004.txt", "abc005.txt", "abc010.txt", "xbc007.txt"
Run test:
            check  "abc601.txt", "abc602.txt", "abc603.txt", "abc604.txt", "abc605.txt", "abc610.txt", "xbc007.txt" are present

Test Four:

            fn1 = "abc*"                                                        
            fe1 = "htm"                                                         
            fn2 = "*"                                                           
            fe2 = "??"                                                          
            create "abc001.htm", "abc002.htm", "abc003.htm", "abc004.htm", "abc005.htm", "abc010.htm", "xbc007.htm"
Run test:
           check "abc001.ht", "abc002.ht", "abc003.ht", "abc004.ht", "abc005.ht", "abc010.ht", "xbc007.htm" are present

stsp · 2018-12-11T20:02:58Z

How about attaching binaries?

andrewbird · 2018-12-11T20:39:51Z

Okay, will do later.

stsp · 2018-12-11T20:42:45Z

Preferably in a new ticket then.

andrewbird · 2018-12-11T23:44:51Z

opened issue #44 to continue

stsp · 2018-12-12T00:44:11Z

Not sure why you say "FreeDOS/FDPP
stuff" in this context. In the past you said
you got tired of freedos because its
difficult to build, debug and reports are
ignored. fdpp addresses all of these:
easiest dos to build and debug, in the
whole world (unlikely some other dos
is built that easily or debugged with gdb),
and the tickets are never ignored.
So its a dos of your dream not less,
get with it. :)

andrewbird · 2018-12-12T09:46:39Z

I have a short attention span these days, and if I don't grok the code, or I find things otherwise awkward I move on. No offence intended regarding FDPP, I'm sure you are right.

stsp · 2018-12-12T09:56:52Z

Well you can note the awkward code into wiki,
so that it can later be cleaned up. I won't hesitate
to change the freedos code now, as the back-merge
is unlikely to happen anyway. But I am not looking
into it frequently enough to notice the awkward things,
so the hints would help.

…p#42 (comment)

stsp reviewed Nov 20, 2018

View reviewed changes

andrewbird mentioned this pull request Dec 11, 2018

fcb rename wildcard expansion #44

Closed

andrewbird closed this Dec 11, 2018

andrewbird deleted the FcbRename-02 branch February 18, 2019 09:29

PerditionC added a commit to FDOS/kernel that referenced this pull request Aug 21, 2021

add tests for FCB rename - based on tests from andrewbird dosemu2/fdp…

cb908cf

…p#42 (comment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FCB: Rename should support asterisk wildcards #42

FCB: Rename should support asterisk wildcards #42

andrewbird commented Nov 20, 2018 •

edited

Loading

andrewbird commented Nov 20, 2018

stsp Nov 20, 2018

andrewbird Nov 20, 2018

andrewbird Nov 20, 2018

stsp commented Nov 20, 2018

andrewbird commented Nov 20, 2018

stsp commented Nov 20, 2018

andrewbird commented Nov 20, 2018

stsp Nov 20, 2018

andrewbird Nov 20, 2018

stsp Nov 20, 2018

andrewbird Nov 20, 2018

stsp Nov 20, 2018

andrewbird Nov 20, 2018

stsp Nov 20, 2018

stsp commented Dec 11, 2018

andrewbird commented Dec 11, 2018

stsp commented Dec 11, 2018

andrewbird commented Dec 11, 2018

stsp commented Dec 11, 2018

andrewbird commented Dec 11, 2018

stsp commented Dec 12, 2018

andrewbird commented Dec 12, 2018

stsp commented Dec 12, 2018

FCB: Rename should support asterisk wildcards #42

FCB: Rename should support asterisk wildcards #42

Conversation

andrewbird commented Nov 20, 2018 • edited Loading

andrewbird commented Nov 20, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stsp commented Nov 20, 2018

andrewbird commented Nov 20, 2018

stsp commented Nov 20, 2018

andrewbird commented Nov 20, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stsp commented Dec 11, 2018

andrewbird commented Dec 11, 2018

stsp commented Dec 11, 2018

andrewbird commented Dec 11, 2018

stsp commented Dec 11, 2018

andrewbird commented Dec 11, 2018

stsp commented Dec 12, 2018

andrewbird commented Dec 12, 2018

stsp commented Dec 12, 2018

andrewbird commented Nov 20, 2018 •

edited

Loading