- 
                Notifications
    You must be signed in to change notification settings 
- Fork 3.4k
When opening broken symlink with O_CREAT, create file at target #23002
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.
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
          
     Merged
      
      
            sbc100
  merged 12 commits into
  emscripten-core:main
from
hoodmane:open-broken-link-create
  
      
      
   
  Dec 5, 2024 
      
    
  
     Merged
                    Changes from 1 commit
      Commits
    
    
            Show all changes
          
          
            12 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      5bd422e
              
                When opening broken symlink with O_CREAT, create file at target
              
              
                hoodmane 751652c
              
                Update test
              
              
                hoodmane 96e318f
              
                Add missing throw
              
              
                hoodmane 9beea7e
              
                Remove try/catch block which is no longer needed
              
              
                hoodmane 1f5a17e
              
                Rename option and add comment
              
              
                hoodmane bd1849b
              
                Fix
              
              
                hoodmane 39428ce
              
                Add also_with_noderawfs to test
              
              
                hoodmane 7cd0603
              
                Fix test_unistd_open
              
              
                hoodmane a7a0bcd
              
                Merge branch 'main' into open-broken-link-create
              
              
                hoodmane e244345
              
                Rename test files
              
              
                hoodmane 6304e9c
              
                Inline strings
              
              
                hoodmane d2d09db
              
                Merge branch 'main' into open-broken-link-create
              
              
                hoodmane File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
|  | @@ -199,8 +199,14 @@ FS.staticInit(); | |
| break; | ||
| } | ||
|  | ||
| current = FS.lookupNode(current, parts[i]); | ||
| current_path = PATH.join2(current_path, parts[i]); | ||
| try { | ||
| current = FS.lookupNode(current, parts[i]); | ||
| } catch (e) { | ||
| if ((e?.errno === {{{ cDefs.ENOENT }}}) && islast && opts.handleBrokenLink) { | ||
| return { path: current_path }; | ||
| } | ||
| } | ||
|  | ||
| // jump to the mount's root node if this is a mountpoint | ||
| if (FS.isMountpoint(current)) { | ||
|  | @@ -213,11 +219,17 @@ FS.staticInit(); | |
| // setting opts.follow = true will override this behavior. | ||
| if (!islast || opts.follow) { | ||
| var count = 0; | ||
| while (FS.isLink(current.mode)) { | ||
| var link = FS.readlink(current_path); | ||
| while (current && FS.isLink(current.mode)) { | ||
| if (!current.node_ops.readlink) { | ||
| throw new FS.ErrnoError({{{ cDefs.ENOSYS }}}); | ||
| } | ||
| var link = current.node_ops.readlink(current); | ||
| There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Before this change,  | ||
| current_path = PATH_FS.resolve(PATH.dirname(current_path), link); | ||
|  | ||
| var lookup = FS.lookupPath(current_path, { recurse_count: opts.recurse_count + 1 }); | ||
| var lookup = FS.lookupPath(current_path, { | ||
| recurse_count: opts.recurse_count + 1, | ||
| handleBrokenLink: islast && opts.handleBrokenLink | ||
| }); | ||
| current = lookup.node; | ||
|  | ||
| if (count++ > 40) { // limit max consecutive symlinks to 40 (SYMLOOP_MAX). | ||
|  | @@ -1027,9 +1039,11 @@ FS.staticInit(); | |
| path = PATH.normalize(path); | ||
| try { | ||
| var lookup = FS.lookupPath(path, { | ||
| follow: !(flags & {{{ cDefs.O_NOFOLLOW }}}) | ||
| follow: !(flags & {{{ cDefs.O_NOFOLLOW }}}), | ||
| handleBrokenLink: true | ||
| }); | ||
| node = lookup.node; | ||
| path = lookup.path; | ||
| } catch (e) { | ||
| // ignore | ||
| } | ||
|  | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #include <stdlib.h> | ||
| #include <errno.h> | ||
| #include <fcntl.h> | ||
| #include <stdio.h> | ||
| #include <string.h> | ||
| #include <unistd.h> | ||
|  | ||
|  | ||
| char* join_path(const char* path1, const char* path2) { | ||
| int len1 = strlen(path1); | ||
| int len2 = strlen(path2); | ||
| char* result = malloc(len1 + len2 + 2); | ||
| memcpy(result, path1, len1); | ||
| result[len1] = '/'; | ||
| memcpy(result + len1 + 1, path2, len2); | ||
| return result; | ||
| } | ||
|  | ||
| int main() { | ||
| char template[] = "/tmp/tmpdir.XXXXXX"; | ||
| char *tmpdir = mkdtemp(template); | ||
|         
                  hoodmane marked this conversation as resolved.
              Outdated
          
            Show resolved
            Hide resolved | ||
| char* p1 = join_path(tmpdir, "test"); | ||
| char* p2 = join_path(tmpdir, "test2"); | ||
|  | ||
| int res = symlink(p2, p1); | ||
| printf("link result: %d\n", res); | ||
| int src_fd = open(p1, O_CREAT | O_WRONLY, 0777); | ||
| printf("source_fd: %d, errno: %d %s\n", src_fd, errno, strerror(errno)); | ||
| write(src_fd, "abc", 3); | ||
| close(src_fd); | ||
| { | ||
| int target_fd = open(p2, O_RDONLY); | ||
| printf("target_fd: %d, errno: %d %s\n", target_fd, errno, strerror(errno)); | ||
| char buf[10]; | ||
| read(target_fd, buf, 10); | ||
| printf("buf: '%s'\n", buf); | ||
| close(target_fd); | ||
| } | ||
| { | ||
| int target_fd = open(p1, O_RDONLY); | ||
| printf("target_fd: %d, errno: %d %s\n", target_fd, errno, strerror(errno)); | ||
| char buf[10]; | ||
| read(target_fd, buf, 10); | ||
| printf("buf: '%s'\n", buf); | ||
| close(target_fd); | ||
| } | ||
| free(p1); | ||
| free(p2); | ||
|         
                  hoodmane marked this conversation as resolved.
              Outdated
          
            Show resolved
            Hide resolved | ||
| } | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| link result: 0 | ||
| source_fd: 3, errno: 0 No error information | ||
| target_fd: 3, errno: 0 No error information | ||
| buf: 'abc' | ||
| target_fd: 3, errno: 0 No error information | ||
| buf: 'abc' | 
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.