mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS crashrep10 (1.11.8); FILE MERGED

Browse Source 
2003/07/24 17:38:54 hro 1.11.8.1: #111037# Don't include UID in error report
This commit is contained in:
Vladimir Glazounov
2003-07-25 10:27:38 +00:00
parent 9a3676a151
commit f1c74ba219
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crashrep/source/unx/main.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: main.cxx,v $ * $RCSfile: main.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: hr $ $Date: 2003-07-16 17:11:57 $ * last change: $Author: vg $ $Date: 2003-07-25 11:27:38 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -141,13 +141,6 @@ static const char *getlocale()
return locale; return locale;
} }
static const char *get_user_name()
{
struct passwd *ppwd = getpwuid( getuid() );
return ppwd ? (ppwd->pw_name ? ppwd->pw_name : "") : "";
}
static const char *get_home_dir() static const char *get_home_dir()
{ {
struct passwd *ppwd = getpwuid( getuid() ); struct passwd *ppwd = getpwuid( getuid() );
@@ -301,7 +294,7 @@ bool write_report( const hash_map< string, string >& rSettings )
fprintf( fp, fprintf( fp,
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE errormail:errormail PUBLIC \"-//OpenOffice.org//DTD ErrorMail 1.0//EN\" \"errormail.dtd\">\n" "<!DOCTYPE errormail:errormail PUBLIC \"-//OpenOffice.org//DTD ErrorMail 1.0//EN\" \"errormail.dtd\">\n"
"<errormail:errormail xmlns:errormail=\"http://openoffice.org/2002/errormail\" uid=\"%s\" usertype=\"%s\">\n" "<errormail:errormail xmlns:errormail=\"http://openoffice.org/2002/errormail\" usertype=\"%s\">\n"
"<reportmail:mail xmlns:reportmail=\"http://openoffice.org/2002/reportmail\" version=\"1.0\" feedback=\"%s\" email=\"%s\">\n" "<reportmail:mail xmlns:reportmail=\"http://openoffice.org/2002/reportmail\" version=\"1.0\" feedback=\"%s\" email=\"%s\">\n"
"<reportmail:title>%s</reportmail:title>\n" "<reportmail:title>%s</reportmail:title>\n"
"<reportmail:attachment name=\"description.txt\" media-type=\"text/plain\" class=\"UserComment\"/>\n" "<reportmail:attachment name=\"description.txt\" media-type=\"text/plain\" class=\"UserComment\"/>\n"
@@ -309,7 +302,6 @@ bool write_report( const hash_map< string, string >& rSettings )
"</reportmail:mail>\n" "</reportmail:mail>\n"
"<officeinfo:officeinfo xmlns:officeinfo=\"http://openoffice.org/2002/officeinfo\" build=\"%s\" platform=\"%s\" language=\"%s\" exceptiontype=\"%d\" product=\"%s\" procpath=\"%s\"/>\n" "<officeinfo:officeinfo xmlns:officeinfo=\"http://openoffice.org/2002/officeinfo\" build=\"%s\" platform=\"%s\" language=\"%s\" exceptiontype=\"%d\" product=\"%s\" procpath=\"%s\"/>\n"
, ,
get_user_name(),
pszUserType ? pszUserType : "", pszUserType ? pszUserType : "",
xml_encode(rSettings.find( "CONTACT" )->second).c_str(), xml_encode(rSettings.find( "CONTACT" )->second).c_str(),
xml_encode(rSettings.find( "EMAIL" )->second).c_str(), xml_encode(rSettings.find( "EMAIL" )->second).c_str(),