Attachment #5902 for bug #29267

View | Details | Raw Unified | Return to bug 29267
Collapse All | Expand All

Lines 289-294 get_pipe_path( rtl_uString *pAppPath ) Link Here

(-)a/libreoffice/desktop/unx/source/start.c (-1 / +5 lines)
289	rtlBootstrapHandle handle;	289	rtlBootstrapHandle handle;
290	rtl_uString *pMd5hash = NULL;	290	rtl_uString *pMd5hash = NULL;
291	sal_Unicode pUnicode[RTL_USTR_MAX_VALUEOFINT32];	291	sal_Unicode pUnicode[RTL_USTR_MAX_VALUEOFINT32];
		292	char *env_tmpdir;
292		293
293	/* setup bootstrap filename */	294	/* setup bootstrap filename */
294	rtl_uString_newFromAscii( &pPath, "file://" );	295	rtl_uString_newFromAscii( &pPath, "file://" );
Lines 318-324 get_pipe_path( rtl_uString *pAppPath ) Link Here
318	if ( !pMd5hash )	319	if ( !pMd5hash )
319	rtl_uString_new( &pMd5hash );	320	rtl_uString_new( &pMd5hash );
320		321
321	if ( access( PIPEDEFAULTPATH, R_OK\|W_OK ) == 0 )	322	env_tmpdir = getenv("TMPDIR");
		323	if ( access( env_tmpdir, R_OK\|W_OK ) == 0 )
		324	rtl_uString_newFromAscii( &pResult, env_tmpdir );
		325	else if ( access( PIPEDEFAULTPATH, R_OK\|W_OK ) == 0 )
322	rtl_uString_newFromAscii( &pResult, PIPEDEFAULTPATH );	326	rtl_uString_newFromAscii( &pResult, PIPEDEFAULTPATH );
323	else	327	else
324	rtl_uString_newFromAscii( &pResult, PIPEALTERNATEPATH );	328	rtl_uString_newFromAscii( &pResult, PIPEALTERNATEPATH );




    int    Flags;
    size_t     len;
    struct sockaddr_un addr;
    char *env_tmpdir;

    sal_Char     name[PATH_MAX + 1];
    size_t nNameLength = 0;
    int bNameTooLong = 0;
    oslPipe  pPipe;

    env_tmpdir = getenv("TMPDIR");
    if (access(env_tmpdir, R_OK|W_OK) == 0)
    {
        strncpy(name, env_tmpdir, sizeof(name));
    }
    else if (access(PIPEDEFAULTPATH, R_OK|W_OK) == 0)
    {
        strncpy(name, PIPEDEFAULTPATH, sizeof(name));
    }

Return to bug 29267

Lines 187-199 oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Link Here

(-)a/libreoffice/sal/osl/unx/pipe.c (-1 / +7 lines)
187	int Flags;	187	int Flags;
188	size_t len;	188	size_t len;
189	struct sockaddr_un addr;	189	struct sockaddr_un addr;
		190	char *env_tmpdir;
190		191
191	sal_Char name[PATH_MAX + 1];	192	sal_Char name[PATH_MAX + 1];
192	size_t nNameLength = 0;	193	size_t nNameLength = 0;
193	int bNameTooLong = 0;	194	int bNameTooLong = 0;
194	oslPipe pPipe;	195	oslPipe pPipe;
195		196
196	if (access(PIPEDEFAULTPATH, R_OK\|W_OK) == 0)	197	env_tmpdir = getenv("TMPDIR");
		198	if (access(env_tmpdir, R_OK\|W_OK) == 0)
		199	{
		200	strncpy(name, env_tmpdir, sizeof(name));
		201	}
		202	else if (access(PIPEDEFAULTPATH, R_OK\|W_OK) == 0)
197	{	203	{
198	strncpy(name, PIPEDEFAULTPATH, sizeof(name));	204	strncpy(name, PIPEDEFAULTPATH, sizeof(name));
199	}	205	}