Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change in the linux code - Some old Inertia stuff was lurking undetected in it.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-22 06:39:14 -04:00
parent b538b4fa2d
commit 9e91f88696
1 changed files with 2 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
indra/newview/llappviewerlinux.cpp
View File

@@ -732,102 +732,8 @@ std::string LLAppViewerLinux::generateSerialNumber()
{
char serial_md5[MD5HEX_STR_SIZE];
serial_md5[0] = 0;
#if LL_SOLARIS
// TODO
#else
//Leave this commented out for now since it could be used to distinguish inertia from other viewers on linux
/*
// I'm going to assume this works on everything but solaris
std::string rootDeviceName = "";
std::string rootDeviceUUID = "";
std::ifstream mountsFile ("/proc/mounts", std::ios_base::in);
std::string line;
while (getline(mountsFile, line, '\n'))
{
std::vector<std::string> splitline;
boost::split(splitline, line, boost::is_any_of(" "));
if(splitline[0] != "rootfs" && splitline[1] == "/")
{
//bingo!
rootDeviceName = splitline[0];
splitline.clear();
break;
}
else
{
splitline.clear();
}
}
mountsFile.close();
DIR *dp;
struct dirent *ep;
char targetDir[] = "/dev/disk/by-uuid/";
dp = opendir (targetDir);
if (dp != NULL)
{
while ((ep = readdir (dp)))
{
if(strcmp(".", ep->d_name) != 0 && strcmp("..", ep->d_name) != 0)
{
char buf[512];
char* targetLink = new char[1024];
strcpy(targetLink, targetDir);
strcat(targetLink, ep->d_name);
int count = readlink(targetLink, buf, sizeof(buf));
if (count >= 0)
{
buf[count] = '\0';
std::vector<std::string> splitSymlink;
boost::split(splitSymlink, buf, boost::is_any_of("/"));
//alright, this is the root partition, print out its uuid
if("/dev/" + splitSymlink[splitSymlink.size() - 1] == rootDeviceName)
{
rootDeviceUUID = ep->d_name;
splitSymlink.clear();
break;
}
else
{
splitSymlink.clear();
}
}
}
}
(void) closedir (dp);
}
else
{
llwarns << "Couldn't open /dev/disk/by-uuid/" << llendl;
}
if(rootDeviceName != "" && rootDeviceUUID != "")
{
LLMD5 md5;
md5.update( (unsigned char*)rootDeviceUUID.c_str(), sizeof(char[36]));
md5.finalize();
md5.hex_digest(serial_md5);
llinfos << "Root Device: " << rootDeviceName << "\tUUID: " << rootDeviceUUID << "\tHash: " << serial_md5 << llendl;
}
else
{
llwarns << "Could not find root device's UUID" << llendl;
}
*/
#endif
// TODO
return serial_md5;
}