Merge branch 'copilot/update-dnd-protocol-symlink-handling' of https://github.com/kovidgoyal/kitty

Author: kovidgoyal

docs/dnd-protocol.rst

@@ -179,8 +179,8 @@ encoded and might be chunked if the directory has a lot of entries.
 
 ``idx`` is an arbitrary 32 bit integer that acts as a handle to this
 directory. The client can now read the files in this directory using requests of the form
-``t=d:x=idx:y=num:r=request_id``, here ``num`` is the 0-based index into the list of
-directory entries previously transmitted to the client, where, ``0`` will
+``t=d:x=idx:y=num:r=request_id``, here ``num`` is the 1-based index into the list of
+directory entries previously transmitted to the client, where, ``1`` will
 correspond to the first entry in the directory. Once the client is done
 reading a directory it should transmit ``t=d:x=idx:r=request_id`` to the terminal. The
 terminal can then free any resources associated with that directory. The

gen/apc_parsers.py

@@ -114,13 +114,15 @@ def generate(
     payload_is_base64: bool = True,
     start_parsing_at: int = 1,
     field_sep: str = ',',
+    post_init: str = '',
 ) -> str:
     type_map = resolve_keys(keymap)
     keys_enum = enum(keymap)
     handle_key = parse_key(keymap)
     flag_keys = parse_flag(keymap, type_map, command_class)
     int_keys, uint_keys = parse_number(keymap)
     report_cmd = cmd_for_report(report_name, keymap, type_map, payload_allowed, payload_is_base64)
+    post_init_line = f'\n    {post_init}' if post_init else ''
     extra_init = ''
     if payload_allowed:
         payload_after_value = "case ';': state = PAYLOAD; break;"
@@ -163,7 +165,7 @@ def generate(
     {extra_init}
     enum PARSER_STATES {{ KEY, EQUAL, UINT, INT, FLAG, AFTER_VALUE {payload} }};
     enum PARSER_STATES state = KEY, value_state = FLAG;
-    {command_class} g = {{0}};
+    {command_class} g = {{0}};{post_init_line}
     unsigned int i, code;
     uint64_t lcode; int64_t accumulator;
     bool is_negative; (void)is_negative;

kitty/dnd.c

@@ -710,9 +710,6 @@ drop_find_dir_handle(Window *w, uint32_t id) {
  * send the listing to the client as a t=d:x=handle_id response. */
 static void
 drop_send_dir_listing(Window *w, const char *path) {
-    struct stat st;
-    if (stat(path, &st) < 0) { drop_send_error(w, EIO); return; }
-
     DIR *dir = opendir(path);
     if (!dir) {
         switch (errno) {
@@ -723,17 +720,11 @@ drop_send_dir_listing(Window *w, const char *path) {
         return;
     }
 
-    /* Build null-separated payload: unique_id\0entry1\0entry2\0... */
+    /* Build null-separated payload: entry1\0entry2\0... */
     size_t payload_cap = 4096, payload_sz = 0;
     char *payload = malloc(payload_cap);
     if (!payload) { closedir(dir); drop_send_error(w, EIO); return; }
 
-    /* First entry: unique identifier (device:inode) */
-    char uid[64];
-    int uid_len = snprintf(uid, sizeof(uid), "%llu:%llu",
-                           (unsigned long long)st.st_dev,
-                           (unsigned long long)st.st_ino);
-
 #define APPEND(s, n) do { \
     size_t _n = (size_t)(n); \
     size_t _need = payload_sz + _n + 1; \
@@ -748,8 +739,6 @@ drop_send_dir_listing(Window *w, const char *path) {
     payload[payload_sz++] = 0; \
 } while(0)
 
-    APPEND(uid, uid_len);
-
     /* Collect directory entries */
     size_t ents_cap = 16, ents_num = 0;
     char **ents = malloc(sizeof(char *) * ents_cap);
@@ -909,8 +898,8 @@ do_drop_handle_dir_request(Window *w, uint32_t handle_id, int32_t entry_num) {
         drop_send_error(w, EIO); return true;
     }
 
-    struct stat st;
-    if (stat(full, &st) < 0) {
+    struct stat lst;
+    if (lstat(full, &lst) < 0) {
         switch (errno) {
             case ENOENT: case ENOTDIR: case ELOOP: drop_send_error(w, ENOENT); break;
             case EACCES: case EPERM:               drop_send_error(w, EPERM); break;
@@ -919,10 +908,32 @@ do_drop_handle_dir_request(Window *w, uint32_t handle_id, int32_t entry_num) {
         return true;
     }
 
-    if (S_ISDIR(st.st_mode)) {
+    if (S_ISLNK(lst.st_mode)) {
+        /* Symlink: send the symlink target as t=r:X=1 */
+        char target[PATH_MAX];
+        ssize_t tlen = readlink(full, target, sizeof(target) - 1);
+        if (tlen < 0) {
+            switch (errno) {
+                case ENOENT: case ENOTDIR: drop_send_error(w, ENOENT); break;
+                case EACCES: case EPERM:   drop_send_error(w, EPERM); break;
+                default:                   drop_send_error(w, EIO); break;
+            }
+            return true;
+        }
+        target[tlen] = '\0';
+        char hdr[128];
+        int hdr_sz = snprintf(hdr, sizeof(hdr), "\x1b]%d;t=r:X=1", DND_CODE);
+        if (w->drop.current_request_id)
+            hdr_sz += snprintf(hdr + hdr_sz, sizeof(hdr) - hdr_sz, ":r=%u", (unsigned)w->drop.current_request_id);
+        queue_payload_to_child(w->id, w->drop.client_id, &w->drop.pending, hdr, hdr_sz, target, (size_t)tlen, true);
+        queue_payload_to_child(w->id, w->drop.client_id, &w->drop.pending, hdr, hdr_sz, NULL, 0, true);
+        return true;
+    }
+
+    if (S_ISDIR(lst.st_mode)) {
         drop_send_dir_listing(w, full);
         return true;
-    } else if (S_ISREG(st.st_mode)) {
+    } else if (S_ISREG(lst.st_mode)) {
         return drop_send_file_data(w, full);
     } else {
         drop_send_error(w, EINVAL);