Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use filepath.clean instead of path.clean #26404

Merged
merged 4 commits into from
Jan 13, 2023
Merged

Use filepath.clean instead of path.clean #26404

merged 4 commits into from
Jan 13, 2023

Conversation

MariusVanDerWijden
Copy link
Member

closes #22367

NOT TESTED UNDER WINDOWS

@holiman
Copy link
Contributor

holiman commented Jan 3, 2023

Failing test:

    test_cmd.go:261: (stderr:21) INFO [01-02|15:39:51.806] IPC endpoint opened                      url=\\.\pipe\\pipe\geth621383

i.e

url=\\.\pipe\\pipe\geth621383

  --- FAIL: TestAttachWelcome/ipc (3.01s)
        run_test.go:107: endpoint \\.\pipe\geth621383 did not open within 3

@fjl
Copy link
Contributor

fjl commented Jan 3, 2023 •
edited
Loading

Named pipe paths are not file paths, they exist in a separate namespace on windows and should not be expanded by this function. Probably best to add a special case for paths starting with \\.\pipe

karalabe
karalabe previously requested changes Jan 3, 2023
View reviewed changes
Copy link
Member

@karalabe karalabe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plop

holiman
holiman reviewed Jan 9, 2023
View reviewed changes
internal/flags/flags.go Outdated Show resolved Hide resolved
holiman
holiman reviewed Jan 9, 2023
View reviewed changes
internal/flags/flags_test.go Outdated
"~thisOtherUser/b/": "~thisOtherUser/b",
"$DDDXXX/a/b": "/tmp/a/b",
"/a/b/": "/a/b",
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? Shouldn't the expansion use / path separators?

Suggested change
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",

@holiman holiman added this to the 1.11.0 milestone Jan 13, 2023
@holiman holiman merged commit 0e486a5 into ethereum:master Jan 13, 2023
shekhirin pushed a commit to shekhirin/go-ethereum that referenced this pull request Jun 6, 2023
@MariusVanDerWijden @shekhirin
Use filepath.clean instead of path.clean (ethereum#26404)
c04743c 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
gzliudan pushed a commit to gzliudan/XDPoSChain that referenced this pull request Nov 22, 2024
@MariusVanDerWijden @gzliudan
Use filepath.clean instead of path.clean (ethereum#26404)
64c061c 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Nov 22, 2024
@gzliudan
Use filepath.clean instead of path.clean (ethereum#26404)
849f88b 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Nov 22, 2024
@gzliudan
Use filepath.clean instead of path.clean (ethereum#26404)
3ca9713 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Nov 22, 2024
@gzliudan
Use filepath.clean instead of path.clean (ethereum#26404)
961a548 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Nov 25, 2024
@gzliudan
Use filepath.clean instead of path.clean (ethereum#26404)
0be6fe3 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
@gzliudan gzliudan mentioned this pull request Nov 25, 2024
Merged
19 tasks
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Nov 25, 2024
@gzliudan
Use filepath.clean instead of path.clean (ethereum#26404)
fa69900 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
JukLee0ira pushed a commit to JukLee0ira/XDPoSChain that referenced this pull request Nov 25, 2024
@gzliudan @JukLee0ira
Use filepath.clean instead of path.clean (ethereum#26404)
c0ef41f 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
JukLee0ira pushed a commit to JukLee0ira/XDPoSChain that referenced this pull request Nov 27, 2024
@gzliudan @JukLee0ira
Use filepath.clean instead of path.clean (ethereum#26404)
ad7cbfa 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
JukLee0ira pushed a commit to JukLee0ira/XDPoSChain that referenced this pull request Nov 27, 2024
@gzliudan @JukLee0ira
Use filepath.clean instead of path.clean (ethereum#26404)
fac069f 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@holiman holiman holiman left review comments

@rjl493456442 rjl493456442 rjl493456442 approved these changes

@karalabe karalabe karalabe left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.11.0
Development

Successfully merging this pull request may close these issues.

Windows - customFlags should use filepath.Clean() instead of path.Clean()
5 participants
@MariusVanDerWijden @holiman @fjl @karalabe @rjl493456442