upstream/mercurial-mirror Files · rust/chg/src/sendfds.c

copies: follow copies across merge base without source file (issue6163)...

copies: follow copies across merge base without source file (issue6163) As in the previous patch, consider these two histories: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' We trace copies from the 'modify x' commit to commit 4 by going via the merge base (commit 0). When tracing file 'y' (_tracefile()) in the first case, we immediately find the rename from 'x'. We check to see if 'x' exists in the merge base, which it does, so we consider it a valid copy. In the second case, 'x' does not exist in the merge base, so it's not considered a valid copy. As a workaround, this patch makes it so we also attempt the check in mergecopies's base commit (commit 1 in the second case). That feels pretty ugly to me, but I don't have any better ideas. Note that we actually also check not only that the filename matches, but also that the file's nodeid matches. I don't know why we do that, but it was like that already before I rewrote mergecopies(). That means that the rebase will still fail in cases like this (again, it already failed before my rewrite): @ 4 'rename x to y' | o 3 'add x again with content X2' | o 2 'remove x' | | o 1 'modify x to content X2' |/ o 1 'modify x to content X1' | o 0 'add x with content X0' Differential Revision: https://phab.mercurial-scm.org/D6604

Yuya Nishihara - - Load All Authors

File last commit:

r40005:208cb7a9 default


                r42798:819712de

default

Download file

             sendfds.c
        
                    51 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / rust / chg / src / sendfds.c
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
rust-chg: add function to send fds via domain socket...

              r40005
            
      /*

       * Utility to send fds via Unix domain socket

       *

       * Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>

       *

       * This software may be used and distributed according to the terms of the

       * GNU General Public License version 2 or any later version.

       */

      #include <errno.h>

      #include <stdlib.h>

      #include <string.h>

      #include <sys/socket.h>

      #include <sys/types.h>

      #define MAX_FD_LEN 10

      /*

       * Sends the given fds with 1-byte dummy payload.

       *

       * Returns the number of bytes sent on success, -1 on error and errno is set

       * appropriately.

       */

      ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)

      {

      	char dummy[1] = {0};

      	struct iovec iov = {dummy, sizeof(dummy)};

      	char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];

      	struct msghdr msgh;

      	struct cmsghdr *cmsg;

      	/* just use a fixed-size buffer since we'll never send tons of fds */

      	if (fdlen > MAX_FD_LEN) {

      		errno = EINVAL;

      		return -1;

      	}

      	memset(&msgh, 0, sizeof(msgh));

      	msgh.msg_iov = &iov;

      	msgh.msg_iovlen = 1;

      	msgh.msg_control = fdbuf;

      	msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

      	cmsg = CMSG_FIRSTHDR(&msgh);

      	cmsg->cmsg_level = SOL_SOCKET;

      	cmsg->cmsg_type = SCM_RIGHTS;

      	cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);

      	memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);

      	msgh.msg_controllen = cmsg->cmsg_len;

      	return sendmsg(sockfd, &msgh, 0);

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Yuya Nishihara rust-chg: add function to send fds via domain socket...	r40005	/*
		* Utility to send fds via Unix domain socket
		*
		* Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>
		*
		* This software may be used and distributed according to the terms of the
		* GNU General Public License version 2 or any later version.
		*/

		#include <errno.h>
		#include <stdlib.h>
		#include <string.h>
		#include <sys/socket.h>
		#include <sys/types.h>

		#define MAX_FD_LEN 10

		/*
		* Sends the given fds with 1-byte dummy payload.
		*
		* Returns the number of bytes sent on success, -1 on error and errno is set
		* appropriately.
		*/
		ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)
		{
		char dummy[1] = {0};
		struct iovec iov = {dummy, sizeof(dummy)};
		char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];
		struct msghdr msgh;
		struct cmsghdr *cmsg;

		/* just use a fixed-size buffer since we'll never send tons of fds */
		if (fdlen > MAX_FD_LEN) {
		errno = EINVAL;
		return -1;
		}

		memset(&msgh, 0, sizeof(msgh));
		msgh.msg_iov = &iov;
		msgh.msg_iovlen = 1;
		msgh.msg_control = fdbuf;
		msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

		cmsg = CMSG_FIRSTHDR(&msgh);
		cmsg->cmsg_level = SOL_SOCKET;
		cmsg->cmsg_type = SCM_RIGHTS;
		cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);
		memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);
		msgh.msg_controllen = cmsg->cmsg_len;
		return sendmsg(sockfd, &msgh, 0);
		}