mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-14 17:07:44 +00:00
4cb4fc3ef8
- Use a secure path for sockets (some code used under license from tmux). - Provide the secure path in the environment as $__fish_runtime_dir. - Link the new path to the old path to ease migration from earlier versions. Closes #1359. After installing fish built from or after this commit, you MUST terminate all running fishd processes (`killall fishd`, `pkill fishd` or similar). Distributors are encouraged to do this from within their packaging scripts. fishd will restart automatically, and no data should be lost.
207 lines
4.6 KiB
C++
207 lines
4.6 KiB
C++
#ifndef FISH_ENV_UNIVERSAL_COMMON_H
|
|
#define FISH_ENV_UNIVERSAL_COMMON_H
|
|
|
|
#include <wchar.h>
|
|
#include <queue>
|
|
#include <string>
|
|
#include "util.h"
|
|
|
|
/**
|
|
The set command
|
|
*/
|
|
#define SET_STR L"SET"
|
|
|
|
/**
|
|
The set_export command
|
|
*/
|
|
#define SET_EXPORT_STR L"SET_EXPORT"
|
|
|
|
/**
|
|
The erase command
|
|
*/
|
|
#define ERASE_STR L"ERASE"
|
|
|
|
/**
|
|
The barrier command
|
|
*/
|
|
#define BARRIER_STR L"BARRIER"
|
|
|
|
/**
|
|
The barrier_reply command
|
|
*/
|
|
#define BARRIER_REPLY_STR L"BARRIER_REPLY"
|
|
|
|
|
|
/**
|
|
The filename to use for univeral variables.
|
|
*/
|
|
#define SOCK_FILENAME "fishd.socket"
|
|
|
|
/**
|
|
The different types of commands that can be sent between client/server
|
|
*/
|
|
typedef enum
|
|
{
|
|
SET,
|
|
SET_EXPORT,
|
|
ERASE,
|
|
BARRIER,
|
|
BARRIER_REPLY,
|
|
} fish_message_type_t;
|
|
|
|
/**
|
|
The size of the buffer used for reading from the socket
|
|
*/
|
|
#define ENV_UNIVERSAL_BUFFER_SIZE 1024
|
|
|
|
/**
|
|
A struct representing a message to be sent between client and server
|
|
*/
|
|
typedef struct
|
|
{
|
|
/**
|
|
Number of queues that contain this message. Once this reaches zero, the message should be deleted
|
|
*/
|
|
int count;
|
|
|
|
/**
|
|
Message body. The message must be allocated using enough memory to actually contain the message.
|
|
*/
|
|
std::string body;
|
|
|
|
} message_t;
|
|
|
|
typedef std::queue<message_t *> message_queue_t;
|
|
|
|
/**
|
|
This struct represents a connection between a universal variable server/client
|
|
*/
|
|
class connection_t
|
|
{
|
|
private:
|
|
/* No assignment */
|
|
connection_t &operator=(const connection_t &);
|
|
|
|
public:
|
|
|
|
/**
|
|
The file descriptor this socket lives on
|
|
*/
|
|
int fd;
|
|
|
|
/**
|
|
Queue of unsent messages
|
|
*/
|
|
std::queue<message_t *> unsent;
|
|
|
|
/**
|
|
Set to one when this connection should be killed
|
|
*/
|
|
bool killme;
|
|
/**
|
|
The input string. Input from the socket goes here. When a
|
|
newline is encountered, the buffer is parsed and cleared.
|
|
*/
|
|
std::vector<char> input;
|
|
|
|
/**
|
|
The read buffer.
|
|
*/
|
|
std::vector<char> read_buffer;
|
|
|
|
/**
|
|
Number of bytes that have already been consumed.
|
|
*/
|
|
size_t buffer_consumed;
|
|
|
|
/* Constructor */
|
|
connection_t(int input_fd);
|
|
};
|
|
|
|
/**
|
|
Read all available messages on this connection
|
|
*/
|
|
void read_message(connection_t *);
|
|
|
|
/**
|
|
Send as many messages as possible without blocking to the connection
|
|
*/
|
|
void try_send_all(connection_t *c);
|
|
|
|
/**
|
|
Create a messge with the specified properties
|
|
*/
|
|
message_t *create_message(fish_message_type_t type, const wchar_t *key, const wchar_t *val);
|
|
|
|
/**
|
|
Constructs the fish socket filename
|
|
*/
|
|
std::string env_universal_common_get_socket_filename(void);
|
|
|
|
/**
|
|
Init the library
|
|
*/
|
|
void env_universal_common_init(void (*cb)(fish_message_type_t type, const wchar_t *key, const wchar_t *val));
|
|
|
|
/**
|
|
Add all variable names to the specified list
|
|
|
|
This function operate agains the local copy of all universal
|
|
variables, it does not communicate with any other process.
|
|
*/
|
|
void env_universal_common_get_names(wcstring_list_t &lst,
|
|
bool show_exported,
|
|
bool show_unexported);
|
|
|
|
/**
|
|
Perform the specified variable assignment.
|
|
|
|
This function operate agains the local copy of all universal
|
|
variables, it does not communicate with any other process.
|
|
|
|
Do not call this function. Create a message to do it. This function
|
|
is only to be used when fishd is dead.
|
|
*/
|
|
void env_universal_common_set(const wchar_t *key, const wchar_t *val, bool exportv);
|
|
|
|
/**
|
|
Remove the specified variable.
|
|
|
|
This function operate agains the local copy of all universal
|
|
variables, it does not communicate with any other process.
|
|
|
|
Do not call this function. Create a message to do it. This function
|
|
is only to be used when fishd is dead.
|
|
*/
|
|
void env_universal_common_remove(const wcstring &key);
|
|
|
|
/**
|
|
Get the value of the variable with the specified name
|
|
|
|
This function operate agains the local copy of all universal
|
|
variables, it does not communicate with any other process.
|
|
*/
|
|
const wchar_t *env_universal_common_get(const wcstring &name);
|
|
|
|
/**
|
|
Get the export flag of the variable with the specified
|
|
name. Returns false if the variable doesn't exist.
|
|
|
|
This function operate agains the local copy of all universal
|
|
variables, it does not communicate with any other process.
|
|
*/
|
|
bool env_universal_common_get_export(const wcstring &name);
|
|
|
|
/**
|
|
Add messages about all existing variables to the specified connection
|
|
*/
|
|
void enqueue_all(connection_t *c);
|
|
|
|
/**
|
|
Close and destroy the specified connection struct. This frees
|
|
allstructures allocated by the connection, such as ques of unsent
|
|
messages.
|
|
*/
|
|
void connection_destroy(connection_t *c);
|
|
|
|
#endif
|